Patchwork [v2,2/2] meta-toolchain-qt: put QT_CONF_PATH in environment script

login
register
mail settings
Submitter Laurentiu Palcu
Date Oct. 28, 2013, 8:46 p.m.
Message ID <37be54733b16c7a40f92ad0bd4d6734b53d5e6b7.1382992874.git.laurentiu.palcu@intel.com>
Download mbox | patch
Permalink /patch/60667/
State Accepted
Commit 8f431d070c61ee0d2fe8e9d10a9b102e9770de49
Headers show

Comments

Laurentiu Palcu - Oct. 28, 2013, 8:46 p.m.
This will allow apps using QLibraryInfo class to find qt.conf.

[YOCTO #5339]

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
 meta/recipes-qt/meta/meta-toolchain-qt.inc |    1 +
 1 file changed, 1 insertion(+)

Patch

diff --git a/meta/recipes-qt/meta/meta-toolchain-qt.inc b/meta/recipes-qt/meta/meta-toolchain-qt.inc
index 14591a8..c9bdeae 100644
--- a/meta/recipes-qt/meta/meta-toolchain-qt.inc
+++ b/meta/recipes-qt/meta/meta-toolchain-qt.inc
@@ -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