From 83f473b2cdd674803615e7a8a8ab01ca0aa579ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@digia.com>
Date: Mon, 25 Mar 2013 16:03:25 +0100
Subject: [PATCH] Don't use custom namespace for QT_HOST_ARCH/CPUFEATURES

We now have host_build to distinguish the two, and we load
qconfig.pri from both the host and the target mkspec, with
host_build set correctly.

Change-Id: I8b8b80d5487d10bb1d4585d27d10300f609a7775
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---
 configure                        | 11 +++++++----
 tools/configure/configureapp.cpp | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/configure b/configure
index a7d1790969..62e167baae 100755
--- a/configure
+++ b/configure
@@ -6388,10 +6388,13 @@ fi
 cat >>"$QTCONFIG.tmp" <<EOF
 #configuration
 CONFIG += $QTCONFIG_CONFIG
-QT_ARCH = $CFG_ARCH
-QT_HOST_ARCH = $CFG_HOST_ARCH
-QT_CPU_FEATURES = $CFG_CPUFEATURES
-QT_HOST_CPU_FEATURES = $CFG_HOST_CPUFEATURES
+host_build {
+    QT_ARCH = $CFG_HOST_ARCH
+    QT_CPU_FEATURES = $CFG_HOST_CPUFEATURES
+} else {
+    QT_ARCH = $CFG_ARCH
+    QT_CPU_FEATURES = $CFG_CPUFEATURES
+}
 QMAKE_DEFAULT_LIBDIRS = `echo "$DEFAULT_LIBDIRS" | sed 's,^,",;s,$,",' | tr '\n' ' '`
 QMAKE_DEFAULT_INCDIRS = `echo "$DEFAULT_INCDIRS" | sed 's,^,",;s,$,",' | tr '\n' ' '`
 QT_EDITION = $Edition
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index a1ad081d97..9a8aaa5d28 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3142,10 +3142,13 @@ void Configure::generateQConfigPri()
         configStream << " qpa";
 
         configStream << endl;
-        configStream << "QT_ARCH = " << dictionary["QT_ARCH"] << endl;
-        configStream << "QT_HOST_ARCH = " << dictionary["QT_HOST_ARCH"] << endl;
-        configStream << "QT_CPU_FEATURES = " << dictionary["QT_CPU_FEATURES"] << endl;
-        configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl;
+        configStream << "host_build {" << endl;
+        configStream << "    QT_ARCH = " << dictionary["QT_HOST_ARCH"] << endl;
+        configStream << "    QT_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl;
+        configStream << "} else {" << endl;
+        configStream << "    QT_ARCH = " << dictionary["QT_ARCH"] << endl;
+        configStream << "    QT_CPU_FEATURES = " << dictionary["QT_CPU_FEATURES"] << endl;
+        configStream << "}" << endl;
         if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) {
             // FIXME: add detection
             configStream << "QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl;