summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorPeter Kümmel <syntheticpp@gmx.net>2012-09-06 15:25:41 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-09-07 06:30:34 (GMT)
commitfc6569921d4bc06e3d526f18d4b4cd3ef05c2025 (patch)
treece059e14feb1dc742bb8c9f4553cbdbbdd83c1dc /configure
parentb2bf9266bf3f59edc3cf797331bd330bea52a8e6 (diff)
downloadQt-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>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure1
1 files changed, 1 insertions, 0 deletions
diff --git a/configure b/configure
index 7f618dd..cffbc09 100755
--- a/configure
+++ b/configure
@@ -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