summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-11-03 08:22:34 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2016-11-08 04:32:17 +0000
commit969bb10eed646313209fcdd9b84605aa98fc88de (patch)
treefc4d3ad3a51f4aecfe779f7da17ee76a9fc3f649
parent146a2eef5fe35acb65ae5fe7b8ebad771cbd448e (diff)
Enable cross_compile when sysroot is used
The crossCompile test checked only if platform and xplatform are different (which is the usual case), but in yocto builds cross compilation is done by setting both platform and xplatform to the same target mkspec and using host tools from -external-hostbindir. Change-Id: Ib4ae3975a52196d9c0ad52b5b5e9ccd7c1bfe883 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
-rw-r--r--configure.pri1
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.pri b/configure.pri
index 02bce88d96..0e6bb6a6f5 100644
--- a/configure.pri
+++ b/configure.pri
@@ -57,6 +57,7 @@ defineTest(qtConfCommandline_sanitize) {
# callbacks
defineReplace(qtConfFunc_crossCompile) {
+ !isEmpty(config.input.sysroot): return(true)
spec = $$[QMAKE_SPEC]
!equals(spec, $$[QMAKE_XSPEC]): return(true)
return(false)