Add cross_compile to qconfig.pri for global advertising

.qmake.cache is not necessarily accessible to other modules which depend on
information about whether we are cross compiling or not. We might as well
advertise this fact globally via the CONFIG variable in qconfig.pri.

Change-Id: I6dee3e6604e5ca1c775c5f9f834fe29b4e27adb8
Reviewed-by: Donald Carr <donald.carr@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com>

diff --git a/configure b/configure
index 72b1fd6..2b8b403 100755 (executable)
--- a/configure
+++ b/configure
@@ -2528,6 +2528,7 @@ fi
 if [ "$PLATFORM" != "$XPLATFORM" ]; then
     QT_CROSS_COMPILE=yes
     QMAKE_CONFIG="$QMAKE_CONFIG cross_compile"
+    QTCONFIG_CONFIG="$QTCONFIG_CONFIG cross_compile"
 fi
 
 if [ "$BUILD_ON_MAC" = "yes" ]; then

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index eafe547..dea7415 100644 (file)
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2367,8 +2367,10 @@ void Configure::generateOutputVars()
         }
     }
 
-    if (dictionary.contains("XQMAKESPEC") && (dictionary["QMAKESPEC"] != dictionary["XQMAKESPEC"]))
+    if (dictionary.contains("XQMAKESPEC") && (dictionary["QMAKESPEC"] != dictionary["XQMAKESPEC"])) {
             qmakeConfig += "cross_compile";
+            dictionary["CROSS_COMPILE"] = "yes";
+    }
 
     // Directories and settings for .qmake.cache --------------------
 
@@ -2605,6 +2607,8 @@ void Configure::generateCachefile()
             configStream << " no_plugin_manifest";
         if (dictionary["QPA"] == "yes")
             configStream << " qpa";
+        if (dictionary["CROSS_COMPILE"] == "yes")
+            configStream << " cross_compile";
 
         if (dictionary["DIRECTWRITE"] == "yes")
             configStream << "directwrite";