From ebacd72f73b9b3c8d91c6c0988d6c7fe7ed1bca4 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sun, 9 Aug 2009 06:20:34 +0200
Subject: qt4-tools-sdk: Use an install target to install the qt4 utilities

---
 recipes/qt4/qt4-tools-sdk_4.5.2.bb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/recipes/qt4/qt4-tools-sdk_4.5.2.bb b/recipes/qt4/qt4-tools-sdk_4.5.2.bb
index fafb7710c9..c0f2f7aad4 100644
--- a/recipes/qt4/qt4-tools-sdk_4.5.2.bb
+++ b/recipes/qt4/qt4-tools-sdk_4.5.2.bb
@@ -61,12 +61,11 @@ do_compile() {
     done
 }
 
-do_stage() {
-    install -d ${STAGING_BINDIR_NATIVE}/
-    install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake2
+do_install() {
+    install -d ${D}${bindir}
+    install -m 0755 bin/qmake ${D}${bindir}/qmake2
     for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do
-        install -m 0755 bin/${i} ${STAGING_BINDIR_NATIVE}/${i}4
+        install -m 0755 bin/${i} ${D}${bindir}/${i}4
     done
 }
 
-
-- 
cgit v1.2.3


From e513208d784ab2df564c9b99031523599aa528c7 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sun, 9 Aug 2009 06:28:15 +0200
Subject: meta-toolchain-qte: Export some more paths

Export RCC, UIC3, DBUSXML2CPP, DBUSCPP2XML environment variables. This
is based on a patch from Ihar Hrachyshka.

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 recipes/meta/meta-toolchain-qte.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/recipes/meta/meta-toolchain-qte.bb b/recipes/meta/meta-toolchain-qte.bb
index 70c4087211..b654935431 100644
--- a/recipes/meta/meta-toolchain-qte.bb
+++ b/recipes/meta/meta-toolchain-qte.bb
@@ -1,5 +1,5 @@
 # Qt Embedded toolchain
-PR = "r1"
+PR = "r2"
 TOOLCHAIN_HOST_TASK = "task-qte-toolchain-host"
 TOOLCHAIN_TARGET_TASK = "task-qte-toolchain-target"
 
@@ -19,6 +19,10 @@ do_populate_sdk_append() {
        echo 'export OE_QMAKE_INCDIR_QT=${prefix}/${TARGET_SYS}/${layout_includedir}/${QT_DIR_NAME}' >> $script
        echo 'export OE_QMAKE_MOC=${prefix}/${layout_bindir}/moc4' >> $script
        echo 'export OE_QMAKE_UIC=${prefix}/${layout_bindir}/uic4' >> $script
+       echo 'export OE_QMAKE_UIC3=${prefix}/${layout_bindir}/uic34' >> $script
+       echo 'export OE_QMAKE_RCC=${prefix}/${layout_bindir}/rcc4' >> $script
+       echo 'export OE_QMAKE_QDBUSCPP2XML=${prefix}/${layout_bindir}/qdbuscpp2xml4' >> $script
+       echo 'export OE_QMAKE_QDBUSXML2CPP=${prefix}/${layout_bindir}/qdbusxml2cpp4' >> $script
 
        # Repack SDK with new environment-setup
        cd ${SDK_OUTPUT}
-- 
cgit v1.2.3


From 8e50ddc4839d4537425132599cb60ba0d5b546cd Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sun, 9 Aug 2009 08:24:10 +0200
Subject: qt4-x11-free.inc: Do not override the var set by qt4-x11-free-gles

Another attempt to fix the dependencies of qt4-x11-free-gles. Do not
make libqt4-FOO-dev depend on qt4-x11-free-gles which will drag in
more dependencies.

A better fix would be to build the OpenVG graphicsengine unconditionally
and build the screendriver out of this tree and install it as a plugin.

Do the same change to qt4-embedded.inc.
---
 recipes/qt4/qt4-embedded.inc | 4 ++--
 recipes/qt4/qt4-x11-free.inc | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
index 962233efb1..95b770a5a4 100644
--- a/recipes/qt4/qt4-embedded.inc
+++ b/recipes/qt4/qt4-embedded.inc
@@ -6,8 +6,8 @@ HOMEPAGE = "http://www.trolltech.com"
 DEPENDS += "directfb tslib"
 INC_PR = "r14"
 
-QT_BASE_NAME = "qt4-embedded"
-QT_BASE_LIB  = "libqt-embedded"
+QT_BASE_NAME ?= "qt4-embedded"
+QT_BASE_LIB  ?= "libqt-embedded"
 QT_DIR_NAME = "qtopia"
 QT_LIBINFIX = "E"
 
diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc
index 6ca20561cd..59c973f208 100644
--- a/recipes/qt4/qt4-x11-free.inc
+++ b/recipes/qt4/qt4-x11-free.inc
@@ -24,8 +24,8 @@ S = "${WORKDIR}/qt-x11-opensource-src-${PV}"
 
 QT_GLFLAGS ?= "-no-opengl"
 QT_CONFIG_FLAGS += "-no-xinerama -no-xkb ${QT_GLFLAGS}"
-QT_BASE_NAME = "qt4"
-QT_BASE_LIB  = "libqt"
+QT_BASE_NAME ?= "qt4"
+QT_BASE_LIB  ?= "libqt"
 QT_DIR_NAME = "qt4"
 QT_LIBINFIX = ""
 
-- 
cgit v1.2.3