summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Roquetto <rafael.roquetto.qnx@kdab.com>2012-07-17 15:04:47 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-07-17 20:09:59 (GMT)
commitef082f0289b3e0cdbffdc280de5811e78c06e1fc (patch)
tree16153cb4ec0e8c74a2a617b1e392608cc9390b25
parente3e380a07b34b9da87f5835f2cc397e93ab534f5 (diff)
downloadQt-ef082f0289b3e0cdbffdc280de5811e78c06e1fc.zip
Qt-ef082f0289b3e0cdbffdc280de5811e78c06e1fc.tar.gz
Qt-ef082f0289b3e0cdbffdc280de5811e78c06e1fc.tar.bz2
Install right version of tools when x-compiling.
When cross-compiling from a Windows host, we need to install the right (win32) versions of qmake into the target folder. cherry-picked from qt5/qtbase 7267ebe0042e11cf333b99fbcae98d35b23c3bf7 Change-Id: I139645ad11579d62a4d20081bbf383702ee84ae2 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
-rw-r--r--projects.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/projects.pro b/projects.pro
index 5f39a7b..a2bc4b3 100644
--- a/projects.pro
+++ b/projects.pro
@@ -141,7 +141,7 @@ CONFIG -= qt
#qmake
qmake.path=$$[QT_INSTALL_BINS]
-win32 {
+equals(QMAKE_HOST.os, Windows) {
qmake.files=$$QT_BUILD_TREE/bin/qmake.exe
} else {
qmake.files=$$QT_BUILD_TREE/bin/qmake