]> code.ossystems Code Review - openembedded-core.git/commitdiff
meta-toolchain-qt: put QT_CONF_PATH in environment script
authorLaurentiu Palcu <laurentiu.palcu@intel.com>
Mon, 28 Oct 2013 20:46:21 +0000 (22:46 +0200)
committerRobert Yang <liezhi.yang@windriver.com>
Wed, 11 Dec 2013 02:12:21 +0000 (21:12 -0500)
This will allow apps using QLibraryInfo class to find qt.conf.

[YOCTO #5339]

(From OE-Core master rev: fffa4c37c49b169f663d28612b9251819cef9577)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
meta/recipes-qt/meta/meta-toolchain-qt.inc

index 14591a839b81b9034cc3d0ef87fee260b4605129..c9bdeae9ac31a23f2695026456bbe92ec3978349 100644 (file)
@@ -24,6 +24,7 @@ toolchain_create_sdk_env_script_append() {
     echo 'export OE_QMAKE_QDBUSXML2CPP=${QT_TOOLS_PREFIX}/qdbusxml2cpp4' >> $script
     echo 'export OE_QMAKE_QT_CONFIG=${SDKTARGETSYSROOT}/${datadir}/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script
     echo 'export QMAKESPEC=${SDKTARGETSYSROOT}/${datadir}/${QT_DIR_NAME}/mkspecs/linux-g++' >> $script
+    echo 'export QT_CONF_PATH=${SDKPATHNATIVE}/${sysconfdir}/qt.conf' >> $script
 
     # make a symbolic link to mkspecs for compatibility with Nokia's SDK
     # and QTCreator