From ad51c8aa0a00c1bbec7386472ca454079e284051 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Thu, 19 Jan 2017 21:54:41 +0100
Subject: make more use of configure QMAKE_*= arguments in native builds

don't ignore the variable assignments for host tools when we're not
actually cross-building.

(sort of) amends 5060740f.

Task-number: QTBUG-58511
Change-Id: Ideda25fb18a4e0b2d54179b08b6301b94a48e51c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 configure.pri | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure.pri')

diff --git a/configure.pri b/configure.pri
index b7dd9d460f..d49f5f8db2 100644
--- a/configure.pri
+++ b/configure.pri
@@ -997,7 +997,7 @@ defineTest(qtConfOutput_gccSysroot) {
 defineTest(qtConfOutput_qmakeArgs) {
     !$${2}: return()
 
-    $${currentConfig}.output.privatePro = "!host_build {"
+    $${currentConfig}.output.privatePro = "!host_build|!cross_compile {"
     for (a, config.input.qmakeArgs) {
         $${currentConfig}.output.privatePro += "    $$a"
         EXTRA_QMAKE_ARGS += $$system_quote($$a)
-- 
cgit v1.2.3