Patchwork [meta-opie,11/17] qmake.bbclass: adapt for {moc, uic} -> {moc, uic}2 change

login
register
mail settings
Submitter lumag
Date Sept. 18, 2011, 11:23 a.m.
Message ID <1316344999-26642-12-git-send-email-dbaryshkov@gmail.com>
Download mbox | patch
Permalink /patch/11645/
State Accepted, archived
Headers show

Comments

lumag - Sept. 18, 2011, 11:23 a.m.
qt2 tools have suffix 2, adapt qt2 class to use them.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 classes/qmake.bbclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Patch

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}"