summaryrefslogtreecommitdiffstats
path: root/meta/classes/qmake_base.bbclass
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2013-06-07 15:15:37 +1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-11 15:38:03 +0100
commit027358f9406466c8384c8903f6371931a339db33 (patch)
tree207f748a3b42b0fb339c7605978f94972f1c2c79 /meta/classes/qmake_base.bbclass
parent1319e17fa3a945a9a133a87c36522a8385d4eda9 (diff)
downloadpoky-027358f9406466c8384c8903f6371931a339db33.tar.gz
classes/qmake_base: update .pro hack
This adds support for lconvert and xmlpatterns tools and tweaks the sed expressions to handle more complex assignments in .pro files like: LRELEASE = $$targetPath($$[QT_INSTALL_BINS]/lrelease) (From OE-Core rev: 542fefa61f0ac1dcdacac2630fd44950ac11cdd9) Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/qmake_base.bbclass')
-rw-r--r--meta/classes/qmake_base.bbclass15
1 files changed, 13 insertions, 2 deletions
diff --git a/meta/classes/qmake_base.bbclass b/meta/classes/qmake_base.bbclass
index 52e7fb0ff8..79040cde0f 100644
--- a/meta/classes/qmake_base.bbclass
+++ b/meta/classes/qmake_base.bbclass
@@ -94,9 +94,20 @@ qmake_base_do_configure() {
94 fi 94 fi
95 95
96 # Hack .pro files to use OE utilities 96 # Hack .pro files to use OE utilities
97 LCONVERT_NAME=$(basename ${OE_QMAKE_LCONVERT})
98 LRELEASE_NAME=$(basename ${OE_QMAKE_LRELEASE})
99 LUPDATE_NAME=$(basename ${OE_QMAKE_LUPDATE})
100 XMLPATTERNS_NAME=$(basename ${OE_QMAKE_XMLPATTERNS})
97 find -name '*.pro' \ 101 find -name '*.pro' \
98 -exec sed -i -e 's,=\s*.*/lrelease,= ${OE_QMAKE_LRELEASE},g' \ 102 -exec sed -i -e "s|\(=\s*.*\)/$LCONVERT_NAME|\1/lconvert|g" \
99 -e 's,=\s*.*/lupdate,= ${OE_QMAKE_LUPDATE},g' '{}' ';' 103 -e "s|\(=\s*.*\)/$LRELEASE_NAME|\1/lrelease|g" \
104 -e "s|\(=\s*.*\)/$LUPDATE_NAME|\1/lupdate|g" \
105 -e "s|\(=\s*.*\)/$XMLPATTERNS_NAME|\1/xmlpatterns|g" \
106 -e "s|\(=\s*.*\)/lconvert|\1/$LCONVERT_NAME|g" \
107 -e "s|\(=\s*.*\)/lrelease|\1/$LRELEASE_NAME|g" \
108 -e "s|\(=\s*.*\)/lupdate|\1/$LUPDATE_NAME|g" \
109 -e "s|\(=\s*.*\)/xmlpatterns|\1/$XMLPATTERNS_NAME|g" \
110 '{}' ';'
100 111
101#bbnote "Calling '${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'" 112#bbnote "Calling '${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'"
102 unset QMAKESPEC || true 113 unset QMAKESPEC || true