From 7217b0c316ec2caacf1d1d7d8eeb539f86dc16e0 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Mon, 3 Sep 2007 12:22:20 +0000
Subject: classes/{qmake*,qt4x11}.bbclass: Add a qmake2.bbclass to use qmake
 version two     Add a qmake2.bbclass which currently takes over the role of
 qt4x11.bbclass     with setting the QTDIR, MOC, UIC properly. qmake2 and
 qmake now share     qmake-base.bbclass this is why some var assignments and
 functions have     been moved around.     Make webkit-gtk use qmake2 to
 eliminate the Qt3 and Qt4/X11 dependency.

---
 classes/qt4x11.bbclass | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

(limited to 'classes/qt4x11.bbclass')

diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass
index 7046ef1cb9..76a45c33cb 100644
--- a/classes/qt4x11.bbclass
+++ b/classes/qt4x11.bbclass
@@ -1,18 +1,3 @@
-DEPENDS_prepend = "qmake2-native "
 DEPENDS_prepend = "${@["qt4x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt4-x11-free')]}"
-#
-# override variables set by qmake-base to compile Qt4/X11 apps
-#
-export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4"
-export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++"
-export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4"
-export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34"
-export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4"
-export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc4"
-export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake2"
-export OE_QMAKE_LINK = "${CXX}"
-export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}"
-export OE_QMAKE_INCDIR_QT = "${QTDIR}/include"
-export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib"
-export OE_QMAKE_LIBS_QT = "qt"
-export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
+
+inherit qmake2
-- 
cgit v1.2.3