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 /classes/qmake5_base.bbclass | |
| parent | 0010e434f6101edf47aadc6e58d27452570824ac (diff) | |
| download | meta-qt5-6e6e8df75f499f584ed4e7e9a2e00824a9dab9f2.tar.gz | |
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>
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 a556f4f9..edff2c4e 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass | |||
| @@ -85,7 +85,7 @@ generate_qt_config_file_effective_paths() { | |||
| 85 | [EffectivePaths] | 85 | [EffectivePaths] |
| 86 | HostBinaries = ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} | 86 | HostBinaries = ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} |
| 87 | HostData = ${OE_QMAKE_PATH_HOST_DATA} | 87 | HostData = ${OE_QMAKE_PATH_HOST_DATA} |
| 88 | HostPrefix = ${STAGING_DIR_NATIVE}${prefix_native} | 88 | HostPrefix = ${STAGING_DIR_NATIVE} |
| 89 | EOF | 89 | EOF |
| 90 | } | 90 | } |
| 91 | # | 91 | # |