From 969bb10eed646313209fcdd9b84605aa98fc88de Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Thu, 3 Nov 2016 08:22:34 +0200
Subject: Enable cross_compile when sysroot is used

The crossCompile test checked only if platform and xplatform are different
(which is the usual case), but in yocto builds cross compilation is done
by setting both platform and xplatform to the same target mkspec and using
host tools from -external-hostbindir.

Change-Id: Ib4ae3975a52196d9c0ad52b5b5e9ccd7c1bfe883
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 configure.pri | 1 +
 1 file changed, 1 insertion(+)

(limited to 'configure.pri')

diff --git a/configure.pri b/configure.pri
index 02bce88d96..0e6bb6a6f5 100644
--- a/configure.pri
+++ b/configure.pri
@@ -57,6 +57,7 @@ defineTest(qtConfCommandline_sanitize) {
 # callbacks
 
 defineReplace(qtConfFunc_crossCompile) {
+    !isEmpty(config.input.sysroot): return(true)
     spec = $$[QMAKE_SPEC]
     !equals(spec, $$[QMAKE_XSPEC]): return(true)
     return(false)
-- 
cgit v1.2.3