aboutsummaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2017-09-11 10:22:45 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2017-09-12 13:05:23 +0000
commit6e6e8df75f499f584ed4e7e9a2e00824a9dab9f2 (patch)
tree1fd2c192804d3205c6358a44cbffb4650a193d8c /classes
parent0010e434f6101edf47aadc6e58d27452570824ac (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>
Diffstat (limited to 'classes')
-rw-r--r--classes/qmake5_base.bbclass2
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() {
[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
}
#