summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2020-07-08 13:28:09 +0200
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2020-07-08 19:18:09 +0200
commit26eb4e63e0195d49ebfa765e9ae1522a1971464d (patch)
tree929c81d802090db64cd245c5e114fd2ca24a0241
parent17b1c7e6b38e6d544d290089aff8288a23511738 (diff)
Treat -xplatform or -device-option as being a cross compilation
Task-number: QTBUG-85279 Pick-to: 5.15 Pick-to: 5.12 Change-Id: I623108be2cba1dad28c5b692c2b5836a68144854 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--configure.pri2
1 files changed, 2 insertions, 0 deletions
diff --git a/configure.pri b/configure.pri
index 41d0bb81f5..bd282df0aa 100644
--- a/configure.pri
+++ b/configure.pri
@@ -85,6 +85,8 @@ defineTest(qtConfCommandline_coverage) {
# callbacks
defineReplace(qtConfFunc_crossCompile) {
+ !isEmpty(config.input.xplatform): return(true)
+ !isEmpty(config.input.device-option): return(true)
!isEmpty(config.input.sysroot): return(true)
spec = $$[QMAKE_SPEC]
!equals(spec, $$[QMAKE_XSPEC]): return(true)