aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-09-18 14:00:53 +0400
committerPaul Eggleton <paul.eggleton@linux.intel.com>2011-09-18 14:04:52 +0100
commitfe835223a1cf223578362a8227e2d41c084fba86 (patch)
tree329149b283760068ee44a07923dc1284d9809ccf
parent5c19745bcfa4f4502a92cbdceada9fbd312bd7d3 (diff)
downloadmeta-opie-fe835223a1cf223578362a8227e2d41c084fba86.tar.gz
qmake.bbclass: adapt for {moc,uic} -> {moc,uic}2 change
qt2 tools have suffix 2, adapt qt2 class to use them. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--classes/qmake.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/qmake.bbclass b/classes/qmake.bbclass
index 40fc739..3516664 100644
--- a/classes/qmake.bbclass
+++ b/classes/qmake.bbclass
@@ -3,8 +3,8 @@ inherit qmake_base
DEPENDS_prepend = "qmake-native "
export QMAKESPEC
-export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic"
-export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc"
+export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic2"
+export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc2"
export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake"
export OE_QMAKE_CXXFLAGS="-fno-exceptions -fno-rtti ${CXXFLAGS}"
export OE_QMAKE_LINK="${CCLD}"