From e0408a4dee94b9911f43e87a4db6a007d60f2a9d Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Tue, 5 Oct 2010 10:27:14 +0000
Subject: qt4-sdk: Move the symlink creation into meta-toolchain-qt.inc

Move the symlink creation into the meta-toolchain-qt.inc to
make sure that it is working for both Qt/X11 and Qt/Embedded.
---
 recipes/meta/meta-toolchain-qt.inc | 7 ++++++-
 recipes/qt4/qt4-tools-sdk.inc      | 6 +-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/recipes/meta/meta-toolchain-qt.inc b/recipes/meta/meta-toolchain-qt.inc
index ce80c5786b..42cb600e7c 100644
--- a/recipes/meta/meta-toolchain-qt.inc
+++ b/recipes/meta/meta-toolchain-qt.inc
@@ -1,5 +1,5 @@
 # Common Qt toolchain
-INC_PR = "r4"
+INC_PR = "r5"
 
 do_populate_sdk_append() {
        script="${SDK_OUTPUT}/${SDKPATH}/environment-setup"
@@ -18,6 +18,11 @@ do_populate_sdk_append() {
        echo 'export OE_QMAKE_QT_CONFIG=${SDKPATH}/${TARGET_SYS}/${datadir}/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script
        echo 'export QMAKESPEC=${SDKPATH}/${TARGET_SYS}/${datadir}/${QT_DIR_NAME}/mkspecs/linux-g++' >> $script
 
+       # make a symbolic link to mkspecs for compatibility with Nokia's SDK
+       # and QtCreator
+       cd ${SDK_OUTPUT}/${SDKPATH}
+       ln -s ${TARGET_SYS}/usr/share/${QT_DIR_NAME}/mkspecs mkspecs
+
        # Repack SDK with new environment-setup
        cd ${SDK_OUTPUT}
        fakeroot tar cfj ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 .
diff --git a/recipes/qt4/qt4-tools-sdk.inc b/recipes/qt4/qt4-tools-sdk.inc
index 88aa6587e2..bfd1782831 100644
--- a/recipes/qt4/qt4-tools-sdk.inc
+++ b/recipes/qt4/qt4-tools-sdk.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.trolltech.com"
 PRIORITY = "optional"
 LICENSE = "LGPLv2.1 GPLv3"
 
-INC_PR = "r2"
+INC_PR = "r3"
 
 FILESPATHPKG =. "qt-${PV}:"
 inherit sdk
@@ -79,9 +79,5 @@ do_install() {
 	for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do \
 		ln -s ${i}4 ${i}; \
 	done)
-
-	# make a symbolic link to mkspecs for compatibility with Nokia's SDK
-	# and QTCreator
-	(cd ${D}${bindir}/..; ln -s ${TARGET_SYS}/usr/share/qtopia/mkspecs mkspecs;)
 }
 
-- 
cgit 1.2.3-korg