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

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)
-- 
cgit v1.2.3