aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2010-04-19 22:11:17 +0200
committerKoen Kooi <koen@openembedded.org>2010-04-19 22:11:17 +0200
commit8104d8054ea49891b4a92f22ee3b13a70557ceb2 (patch)
tree1f8898d9f2660374cc30ca903b28f03afdc2815b
parentfdba3e6f3c08ee5e75da97b5d75d79b1c97063f6 (diff)
downloadopenembedded-8104d8054ea49891b4a92f22ee3b13a70557ceb2.tar.gz
qmake2: add missing INFIX export in qtopia env script
-rw-r--r--recipes/qmake/qmake2.inc2
-rw-r--r--recipes/qmake/qmake2_2.10a.bb2
2 files changed, 3 insertions, 1 deletions
diff --git a/recipes/qmake/qmake2.inc b/recipes/qmake/qmake2.inc
index 9f3de244bb..2141eafa79 100644
--- a/recipes/qmake/qmake2.inc
+++ b/recipes/qmake/qmake2.inc
@@ -3,7 +3,7 @@ PRIORITY = "optional"
HOMEPAGE = "http://www.trolltech.com"
SECTION = "devel"
LICENSE = "GPL"
-PR = "r9"
+PR = "r10"
# We call 'moc' during the build
DEPENDS = "uicmoc4-native"
diff --git a/recipes/qmake/qmake2_2.10a.bb b/recipes/qmake/qmake2_2.10a.bb
index 37c476ee59..ae5816c896 100644
--- a/recipes/qmake/qmake2_2.10a.bb
+++ b/recipes/qmake/qmake2_2.10a.bb
@@ -16,6 +16,8 @@ do_install() {
script="${D}/${datadir}/qtopia/environment-setup"
touch $script
+ echo 'export QT_DIR_NAME=qtopia' >> $script
+ echo 'export QT_LIBINFIX=E' >> $script
echo 'export OE_QMAKE_CC=gcc' >> $script
echo 'export OE_QMAKE_CXX=g++' >> $script
echo 'export OE_QMAKE_LINK=g++' >> $script