diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2017-09-11 10:22:45 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-09-12 13:05:23 +0000 |
| commit | 6e6e8df75f499f584ed4e7e9a2e00824a9dab9f2 (patch) | |
| tree | 1fd2c192804d3205c6358a44cbffb4650a193d8c | |
| parent | 0010e434f6101edf47aadc6e58d27452570824ac (diff) | |
Use correct HostPrefix
Different HostPrefix was used when building Qt and in external
SDK's qt.conf. This caused e.g., wrong path in qmodule.pri for
PKG_CONFIG_EXECUTABLE.
Task-number: QTBUG-63097
Change-Id: I75a21d9f84f02b2fc1195d810bb3c2d6bdcdd9c6
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | classes/qmake5_base.bbclass | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index a556f4f9..edff2c4e 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -85,7 +85,7 @@ generate_qt_config_file_effective_paths() { [EffectivePaths] HostBinaries = ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} HostData = ${OE_QMAKE_PATH_HOST_DATA} -HostPrefix = ${STAGING_DIR_NATIVE}${prefix_native} +HostPrefix = ${STAGING_DIR_NATIVE} EOF } # diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 7173221e..b13766d4 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -168,7 +168,7 @@ do_install_append() { touch ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/oe-device-extra.pri # Replace host paths with qmake built-in properties - sed -i -e 's|${STAGING_DIR_NATIVE}${prefix_native}|$$[QT_HOST_PREFIX/get]|g' \ + sed -i -e 's|${STAGING_DIR_NATIVE}|$$[QT_HOST_PREFIX/get]|g' \ -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' \ ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/*.pri |