summaryrefslogtreecommitdiff
path: root/classes/qt4x11.bbclass
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-05-06 16:54:45 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-05-06 16:54:45 +0000
commit0e8a03ebe07638a2055dc2316cc43bf735a30a3f (patch)
tree7b5b44b742b3869c8de43bd7d2631b34b1807edf /classes/qt4x11.bbclass
parent3f77edde39cacd61aef016f48b1ac0e33105453d (diff)
qt3x11.bbclass: add DEPENDS on qt3
qt4x11.bbclass: add DEPENDS on qt4
Diffstat (limited to 'classes/qt4x11.bbclass')
-rw-r--r--classes/qt4x11.bbclass25
1 files changed, 13 insertions, 12 deletions
diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass
index 04aff565be..635fc67694 100644
--- a/classes/qt4x11.bbclass
+++ b/classes/qt4x11.bbclass
@@ -1,16 +1,17 @@
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}/uic4"
-export OE_QMAKE_MOC="${STAGING_BINDIR}/moc4"
-export OE_QMAKE_RCC="${STAGING_BINDIR}/rcc4"
-export OE_QMAKE_QMAKE="${STAGING_BINDIR}/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"
+export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4"
+export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++"
+export OE_QMAKE_UIC = "${STAGING_BINDIR}/uic4"
+export OE_QMAKE_MOC = "${STAGING_BINDIR}/moc4"
+export OE_QMAKE_RCC = "${STAGING_BINDIR}/rcc4"
+export OE_QMAKE_QMAKE = "${STAGING_BINDIR}/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"