diff options
| author | Yu Ke <ke.yu@intel.com> | 2010-08-25 11:12:59 +0800 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 13:29:51 +0100 |
| commit | 51e05bbe6c4c78a59114a9197dfd0457506d089c (patch) | |
| tree | 0bb6781ceb715c5f03650431bff90c8cd5e2e13f | |
| parent | 7aa5f112b8d647a7e1220c42d4c55a59c4de994e (diff) | |
| download | openembedded-core-51e05bbe6c4c78a59114a9197dfd0457506d089c.tar.gz openembedded-core-51e05bbe6c4c78a59114a9197dfd0457506d089c.tar.bz2 openembedded-core-51e05bbe6c4c78a59114a9197dfd0457506d089c.zip | |
qmake2.bbclass: update for QT4
qmake2 bbclass is a class to make QT appplication. This commit update qmake2 bbclass for QT4. The code is from OE with minor cleanup.
Signed-off-by: Yu Ke <ke.yu@intel.com>
| -rw-r--r-- | meta/classes/qmake2.bbclass | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/meta/classes/qmake2.bbclass b/meta/classes/qmake2.bbclass index 5d221cc5d5..e6810260f0 100644 --- a/meta/classes/qmake2.bbclass +++ b/meta/classes/qmake2.bbclass @@ -3,18 +3,21 @@ # inherit qmake_base -DEPENDS_prepend = "qmake2-cross uicmoc4-native " +DEPENDS_prepend = "qt4-tools-native" -export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4" -export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++" +export QMAKESPEC = "${STAGING_DATADIR}/qt4/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_QDBUSCPP2XML = "${STAGING_BINDIR_NATIVE}/qdbuscpp2xml4" +export OE_QMAKE_QDBUSXML2CPP = "${STAGING_BINDIR_NATIVE}/qdbusxml2cpp4" 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_INCDIR_QT = "${STAGING_INCDIR}/qt4" +export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}" export OE_QMAKE_LIBS_QT = "qt" export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" +export OE_QMAKE_LRELEASE = "${STAGING_BINDIR_NATIVE}/lrelease4" +export OE_QMAKE_LUPDATE = "${STAGING_BINDIR_NATIVE}/lupdate4" |