summaryrefslogtreecommitdiffstats
path: root/configure.pri
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:27:11 +0000
commit58b2802c82039818af55ab104fbc488a86401ef9 (patch)
tree8975dee64256a3dbeb60920cb882f3a2997e76b5 /configure.pri
parent000a7ae597f2c03080109683a00df77fd32c64a6 (diff)
Treat -xplatform or -device-option as being a cross compilation
Task-number: QTBUG-85279 Change-Id: I623108be2cba1dad28c5b692c2b5836a68144854 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 26eb4e63e0195d49ebfa765e9ae1522a1971464d) Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'configure.pri')
-rw-r--r--configure.pri2
1 files changed, 2 insertions, 0 deletions
diff --git a/configure.pri b/configure.pri
index e775bf046e..3dedffcace 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)