summaryrefslogtreecommitdiff
path: root/openembedded/classes/qt3x11.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-05-09 17:41:09 +0000
committerRichard Purdie <richard@openedhand.com>2006-05-09 17:41:09 +0000
commitba7e2a07578dda8bc38dd9b1bc591859c39f33cc (patch)
tree76d70729005a110ced3a2d771584c2536fd7a07e /openembedded/classes/qt3x11.bbclass
parent572f07af31f16b04f83755ee4d7a245eaf38a9f9 (diff)
downloadopenembedded-core-ba7e2a07578dda8bc38dd9b1bc591859c39f33cc.tar.gz
openembedded-core-ba7e2a07578dda8bc38dd9b1bc591859c39f33cc.tar.bz2
openembedded-core-ba7e2a07578dda8bc38dd9b1bc591859c39f33cc.zip
Further site and class updates from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@381 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/classes/qt3x11.bbclass')
-rw-r--r--openembedded/classes/qt3x11.bbclass20
1 files changed, 12 insertions, 8 deletions
diff --git a/openembedded/classes/qt3x11.bbclass b/openembedded/classes/qt3x11.bbclass
index 09b9cbac96..6e3d5f8ba2 100644
--- a/openembedded/classes/qt3x11.bbclass
+++ b/openembedded/classes/qt3x11.bbclass
@@ -1,11 +1,15 @@
+DEPENDS_prepend = "${@["qt3x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt-x11-free')]}"
+EXTRA_QMAKEVARS_POST += "CONFIG+=thread"
#
# override variables set by qmake-base to compile Qt/X11 apps
#
-export QTDIR="${STAGING_DIR}/${HOST_SYS}/qt3"
-export OE_QMAKE_UIC="${STAGING_BINDIR}/uic3"
-export OE_QMAKE_MOC="${STAGING_BINDIR}/moc3"
-export OE_QMAKE_CXXFLAGS="${CXXFLAGS} -DQT_NO_XIM"
-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"
+export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt3"
+export OE_QMAKE_UIC = "${STAGING_BINDIR}/uic3"
+export OE_QMAKE_MOC = "${STAGING_BINDIR}/moc3"
+export OE_QMAKE_CXXFLAGS = "${CXXFLAGS} -DQT_NO_XIM"
+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"
+
+