t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-06-21 08:52:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

qt5: use correct HostPrefix

Browse Source 
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
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Samuli Piippo
2017-11-10 08:44:36 +02:00
committed by Martin Jansa
parent 1be652e507
commit 70f36ebae4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
classes/qmake5_base.bbclass
View File

@@ -88,7 +88,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
}
#

2
recipes-qt/qt5/qtbase_git.bb
View File

@@ -214,7 +214,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
}