From 45a5c006d12c38d17f5605c2f975a7eabda7456f Mon Sep 17 00:00:00 2001
From: Andras Becsi <andras.becsi@digia.com>
Date: Sat, 28 Sep 2013 03:24:07 +0200
Subject: Allow overriding target compiler and linker with qmake's one

Using make_global_settings, we can pass along the compiler and linker
that qmake uses, still allowing overriding it through environment variables.
We generate qmake_extras.gypi and populated with the host and target compilers
so that it also works when cross compiling.

Based on patch by Pierre Rossi <pierre.rossi@digia.com>

Change-Id: Ia3789abeea88f4d3cde75c2cf07cc9de66d7afbf
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
---
 qtwebengine.pro | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'qtwebengine.pro')

diff --git a/qtwebengine.pro b/qtwebengine.pro
index ce0098c55..5a54df17e 100644
--- a/qtwebengine.pro
+++ b/qtwebengine.pro
@@ -4,7 +4,8 @@ CONFIG += ordered
 
 # The first three subdirs contain dummy .pro files that are used by qmake
 # to generate a corresponding .gyp file
-SUBDIRS = resources \
+SUBDIRS = build/qmake_extras \ # Phony pro file that extracts things like compiler and linker from qmake
+          resources \
           shared \
           lib \
           process \
-- 
cgit v1.2.3