diff options
author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2013-10-28 22:46:21 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-12 17:00:04 +0000 |
commit | 8432caedbddf1b11d26811bfe93cf4cf4ad7de37 (patch) | |
tree | 9cfe83465dd5ffed56e8d1cb2cad899936ea5eb8 /meta/recipes-qt | |
parent | e92c43001024b6207e1fd897caab9aa2fce517f9 (diff) | |
download | poky-8432caedbddf1b11d26811bfe93cf4cf4ad7de37.tar.gz |
meta-toolchain-qt: put QT_CONF_PATH in environment script
This will allow apps using QLibraryInfo class to find qt.conf.
[YOCTO #5339]
(From OE-Core master rev: fffa4c37c49b169f663d28612b9251819cef9577)
(From OE-Core rev: 8dc1d62c5dc161ba606cebe27f6fe900699646f7)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r-- | meta/recipes-qt/meta/meta-toolchain-qt.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-qt/meta/meta-toolchain-qt.inc b/meta/recipes-qt/meta/meta-toolchain-qt.inc index 14591a839b..c9bdeae9ac 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() { | |||
24 | echo 'export OE_QMAKE_QDBUSXML2CPP=${QT_TOOLS_PREFIX}/qdbusxml2cpp4' >> $script | 24 | echo 'export OE_QMAKE_QDBUSXML2CPP=${QT_TOOLS_PREFIX}/qdbusxml2cpp4' >> $script |
25 | echo 'export OE_QMAKE_QT_CONFIG=${SDKTARGETSYSROOT}/${datadir}/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script | 25 | echo 'export OE_QMAKE_QT_CONFIG=${SDKTARGETSYSROOT}/${datadir}/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script |
26 | echo 'export QMAKESPEC=${SDKTARGETSYSROOT}/${datadir}/${QT_DIR_NAME}/mkspecs/linux-g++' >> $script | 26 | echo 'export QMAKESPEC=${SDKTARGETSYSROOT}/${datadir}/${QT_DIR_NAME}/mkspecs/linux-g++' >> $script |
27 | echo 'export QT_CONF_PATH=${SDKPATHNATIVE}/${sysconfdir}/qt.conf' >> $script | ||
27 | 28 | ||
28 | # make a symbolic link to mkspecs for compatibility with Nokia's SDK | 29 | # make a symbolic link to mkspecs for compatibility with Nokia's SDK |
29 | # and QTCreator | 30 | # and QTCreator |