diff options
| author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2013-10-28 22:46:21 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-29 10:41:37 +0000 |
| commit | 8f431d070c61ee0d2fe8e9d10a9b102e9770de49 (patch) | |
| tree | e77125ae3ea6b799350e7af8e05436b371a46d9f | |
| parent | 60e271a3cdb00f46446e9839293cf0f9dba76428 (diff) | |
| download | poky-8f431d070c61ee0d2fe8e9d10a9b102e9770de49.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 rev: fffa4c37c49b169f663d28612b9251819cef9577)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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 |