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-11 14:10:47 +0000 |
| commit | 6c39db8caa6bb1b0773a62c9faee75d59d661ae8 (patch) | |
| tree | 7c2f38b7c9738cf4b1d8d82d922ce254a0e98f92 /meta | |
| parent | dbaa6f0e50a106b797e178ecfc1c06ee214c68a0 (diff) | |
| download | poky-6c39db8caa6bb1b0773a62c9faee75d59d661ae8.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: 6dbad65ed81a8ff80a965351dd9f229be51ca477)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -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 abf12fb84d..be5a819ecb 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 |