diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2017-11-10 08:44:36 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-12-20 08:20:48 +0000 |
| commit | 70f36ebae41a7f4445d8bc94ded78ba4a04613de (patch) | |
| tree | 23ce46b47373e5b0759b3074184daab47fee910e /classes/qmake5_base.bbclass | |
| parent | 1be652e5075bf3c65b521093556e9611c4a57541 (diff) | |
| download | meta-qt5-70f36ebae41a7f4445d8bc94ded78ba4a04613de.tar.gz | |
qt5: 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
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'classes/qmake5_base.bbclass')
| -rw-r--r-- | classes/qmake5_base.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 8e1fe206..d1e0e579 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass | |||
| @@ -88,7 +88,7 @@ generate_qt_config_file_effective_paths() { | |||
| 88 | [EffectivePaths] | 88 | [EffectivePaths] |
| 89 | HostBinaries = ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} | 89 | HostBinaries = ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} |
| 90 | HostData = ${OE_QMAKE_PATH_HOST_DATA} | 90 | HostData = ${OE_QMAKE_PATH_HOST_DATA} |
| 91 | HostPrefix = ${STAGING_DIR_NATIVE}${prefix_native} | 91 | HostPrefix = ${STAGING_DIR_NATIVE} |
| 92 | EOF | 92 | EOF |
| 93 | } | 93 | } |
| 94 | # | 94 | # |