summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2011-06-01 20:09:54 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-02 18:26:38 +0100
commit18011c1a06def5d2ec709ab1958042ef20b394a8 (patch)
treea176ec0cb81a51763ce40f36aed6419579bbef10
parentb0ed5af344192f411631a10418135f2668da6128 (diff)
downloadpoky-18011c1a06def5d2ec709ab1958042ef20b394a8.tar.gz
qmake_base.bbclass: fix lrelease/lupdate binary names
To support translation, qmake based projects usually call lrelease and lupdate however OE changes the binary names so this needs some mangle to work out of box. (From OE-Core rev: 2a52f806f3789f717219651b97dc64fec3881f7f) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Acked-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/qmake_base.bbclass5
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/classes/qmake_base.bbclass b/meta/classes/qmake_base.bbclass
index a054efd249..165d6896b1 100644
--- a/meta/classes/qmake_base.bbclass
+++ b/meta/classes/qmake_base.bbclass
@@ -92,6 +92,11 @@ qmake_base_do_configure() {
92 bbnote "qmake prevar substitution: ${EXTRA_QMAKEVARS_PRE}" 92 bbnote "qmake prevar substitution: ${EXTRA_QMAKEVARS_PRE}"
93 fi 93 fi
94 94
95 # Hack .pro files to use OE utilities
96 find -name '*.pro' \
97 -exec sed -i -e 's,=\s*.*/lrelease,= ${OE_QMAKE_LRELEASE},g' \
98 -e 's,=\s*.*/lupdate,= ${OE_QMAKE_LUPDATE},g' '{}' ';'
99
95#bbnote "Calling '${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'" 100#bbnote "Calling '${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'"
96 unset QMAKESPEC || true 101 unset QMAKESPEC || true
97 ${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling ${OE_QMAKE_QMAKE} on $PROFILES" 102 ${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling ${OE_QMAKE_QMAKE} on $PROFILES"