diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2007-09-06 10:41:59 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2007-09-06 10:41:59 +0000 |
| commit | 8460c2fecbe36ce06135d64b683b0f2c3d924baf (patch) | |
| tree | 31168741ed50561ea536a335b5bfb6b3007771ef /classes/qt4x11.bbclass | |
| parent | 325f26749da469ef7d90430a1be7b6f1e9d014a8 (diff) | |
| parent | 56b356eeb9cbb597e7271068f5b0708b4a7844be (diff) | |
merge of '471f6e7d5fb5bc4d13a2338851dabca9f72b3f0a'
and '89b1d1f0f032b64f7620006be8bcf6271c70f4b8'
Diffstat (limited to 'classes/qt4x11.bbclass')
| -rw-r--r-- | classes/qt4x11.bbclass | 19 |
1 files changed, 2 insertions, 17 deletions
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 |