diff options
| author | Peter Kümmel <syntheticpp@gmx.net> | 2012-09-06 15:25:41 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-07 06:30:34 (GMT) |
| commit | fc6569921d4bc06e3d526f18d4b4cd3ef05c2025 (patch) | |
| tree | ce059e14feb1dc742bb8c9f4553cbdbbdd83c1dc | |
| parent | b2bf9266bf3f59edc3cf797331bd330bea52a8e6 (diff) | |
| download | Qt-fc6569921d4bc06e3d526f18d4b4cd3ef05c2025.zip Qt-fc6569921d4bc06e3d526f18d4b4cd3ef05c2025.tar.gz Qt-fc6569921d4bc06e3d526f18d4b4cd3ef05c2025.tar.bz2 | |
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.
Backported qtbase/3c47b52bd37488d41a3ad068de7976c838b7d63c
Change-Id: Ie2566a44fb26e26af97c791e1ed1592fd650dbbd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 7 |
2 files changed, 7 insertions, 1 deletions
@@ -3008,6 +3008,7 @@ fi if [ "$PLATFORM" != "$XPLATFORM" ]; then QT_CROSS_COMPILE=yes QMAKE_CONFIG="$QMAKE_CONFIG cross_compile" + QTCONFIG_CONFIG="$QTCONFIG_CONFIG cross_compile" fi if [ "$PLATFORM_MAC" = "yes" ]; then diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 7555479..142b2be 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2945,6 +2945,9 @@ void Configure::generateOutputVars() if (dictionary["QPA"] == "yes") qtConfig += "qpa"; + if (dictionary["CROSS_COMPILE"] == "yes") + configStream << " cross_compile"; + if (dictionary["NIS"] == "yes") qtConfig += "nis"; @@ -2992,8 +2995,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 -------------------- |