From e0408a4dee94b9911f43e87a4db6a007d60f2a9d Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther 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 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'recipes/meta/meta-toolchain-qt.inc') 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 . -- cgit 1.2.3-korg