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
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-07-09 08:56:26 +0000
commita0adcb7bd92f755183446c2ceca4867c4bfb9f95 (patch)
tree8a5abb7aec9d589167e5fa31c760d672badbcaa7 /configure.pri
parent3fe33f5143db5c54a7905593c23c1ea4803e42df (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: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
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 037cd0abc4..33c90a8c2f 100644
--- a/configure.pri
+++ b/configure.pri
@@ -61,6 +61,8 @@ defineTest(qtConfCommandline_sanitize) {
# 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)