summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-03-16 12:17:26 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-16 18:12:41 +0100
commitc0791b86ab4b006f9ab2b7f932d5c76a159f6c08 (patch)
treea6a25a9207e71e4e62dbc42a921fc754eb95977d
parent2ea976c3a713535c2419d936d575e0b24545f0fa (diff)
allow the unix generator to run in windows host mode
this is a complete bastardization of the concept and breaks the (unused) debugging feature to create proper unix makefiles under windows, but apparently it permits cross-compiling unix targets under windows. Change-Id: I4ee95a20e7d6a6b2063ec7aa22f52c1a97d78a77 Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
-rw-r--r--qmake/generators/metamakefile.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp
index b855585500..c69d5a5812 100644
--- a/qmake/generators/metamakefile.cpp
+++ b/qmake/generators/metamakefile.cpp
@@ -520,6 +520,9 @@ MetaMakefileGenerator::modesForGenerator(const QString &gen,
#ifdef Q_OS_MAC
*host_mode = Option::HOST_MACX_MODE;
*target_mode = Option::TARG_MACX_MODE;
+#elif defined(Q_OS_WIN)
+ *host_mode = Option::HOST_WIN_MODE;
+ *target_mode = Option::TARG_UNIX_MODE;
#else
*host_mode = Option::HOST_UNIX_MODE;
*target_mode = Option::TARG_UNIX_MODE;