From a0adcb7bd92f755183446c2ceca4867c4bfb9f95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Wed, 8 Jul 2020 13:28:09 +0200
Subject: [PATCH] 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>
---
 configure.pri | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configure.pri b/configure.pri
index 037cd0abc4f..33c90a8c2f1 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)