diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-09-03 14:04:35 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-09-03 14:04:35 +0000 |
| commit | 3ba3acf6374affbaf7e7eed45c59225e307b809c (patch) | |
| tree | 297e91843d838c972e50484360f61011571aca3e /classes/qt4x11.bbclass | |
| parent | 8ba324c9581d435fd728cddda6a5f59740bd3dac (diff) | |
| parent | 7217b0c316ec2caacf1d1d7d8eeb539f86dc16e0 (diff) | |
merge of '0b5587edb6c37bedf357b56ee1438f317f10673f'
and '862b21d8f8b53f723771b71216302b89245e8b8a'
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 |