From 58b2802c82039818af55ab104fbc488a86401ef9 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
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 configure.pri | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configure.pri b/configure.pri
index e775bf046eb..3dedffcace4 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)