summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Carr <donald.carr@nokia.com>2012-02-29 23:55:13 +0000
committerQt by Nokia <qt-info@nokia.com>2012-03-08 23:52:34 +0100
commit3c47b52bd37488d41a3ad068de7976c838b7d63c (patch)
tree785f55e869d27e01259e61e54cb6f03e8ff3b6ba
parent6a5e2fdde368870a9830b26ae1c60c17c329df51 (diff)
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>
-rwxr-xr-xconfigure1
-rw-r--r--tools/configure/configureapp.cpp6
2 files changed, 6 insertions, 1 deletions
diff --git a/configure b/configure
index 72b1fd64b7..2b8b4031ef 100755
--- 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 eafe547063..dea7415d43 100644
--- 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";