diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2014-10-18 15:52:47 -0300 |
|---|---|---|
| committer | Patrick Ohly <patrick.ohly@intel.com> | 2015-01-09 08:46:16 -0800 |
| commit | c7498b55730f48f766a7dfb95a7663700f710785 (patch) | |
| tree | 0df626e88126939de139f644f74e8454e0477094 /meta-qt5 | |
| parent | 9d6c865151c956f4d479b0da480e4cc4327cae70 (diff) | |
| download | tizen-distro-c7498b55730f48f766a7dfb95a7663700f710785.tar.gz tizen-distro-c7498b55730f48f766a7dfb95a7663700f710785.tar.bz2 tizen-distro-c7498b55730f48f766a7dfb95a7663700f710785.zip | |
nativesdk-qtbase: Fix qtconfig.pri
The value used in the new environment subscript tried to use a target
variable which might not be accurate; use qmake to ask for the right
value for OE_QMAKE_QT_CONFIG variable.
(From meta-qt5 rev: 51a4cdf3fcdc132cc7b5af0e240c5d1007e43590)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Diffstat (limited to 'meta-qt5')
| -rw-r--r-- | meta-qt5/recipes-qt/qt5/nativesdk-qtbase.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-qt5/recipes-qt/qt5/nativesdk-qtbase.inc b/meta-qt5/recipes-qt/qt5/nativesdk-qtbase.inc index 12f5a543bb..09f3d9af8e 100644 --- a/meta-qt5/recipes-qt/qt5/nativesdk-qtbase.inc +++ b/meta-qt5/recipes-qt/qt5/nativesdk-qtbase.inc @@ -240,7 +240,7 @@ do_generate_qt_environment_file() { echo 'export OE_QMAKE_RCC=${OE_QMAKE_PATH_HOST_BINS}/rcc' >> $script echo 'export OE_QMAKE_QDBUSCPP2XML=${OE_QMAKE_PATH_HOST_BINS}/qdbuscpp2xml' >> $script echo 'export OE_QMAKE_QDBUSXML2CPP=${OE_QMAKE_PATH_HOST_BINS}/qdbusxml2cpp' >> $script - echo 'export OE_QMAKE_QT_CONFIG=${OE_QMAKE_PATH_TARGET_LIBS}/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script + echo 'export OE_QMAKE_QT_CONFIG=`qmake -query QT_INSTALL_LIBS`/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script echo 'export QMAKESPEC=`qmake -query QT_INSTALL_LIBS`/mkspecs/linux-oe-g++' >> $script # Use relocable sysroot |