diff options
| author | Geir Vattekar <geir.vattekar@nokia.com> | 2010-06-17 07:21:05 (GMT) |
|---|---|---|
| committer | Geir Vattekar <geir.vattekar@nokia.com> | 2010-06-17 07:21:05 (GMT) |
| commit | f39c9f38276add6ead9bb5d380cc2b32b0fa3390 (patch) | |
| tree | 2627db65ca9cddb432232ee21116afea73da07a4 /qmake/generators/metamakefile.cpp | |
| parent | 594900e68f8e264facbe8c75eaf2b857240bc072 (diff) | |
| parent | fac227f609e544f8f55aca8447b4328d6534407a (diff) | |
| download | Qt-f39c9f38276add6ead9bb5d380cc2b32b0fa3390.zip Qt-f39c9f38276add6ead9bb5d380cc2b32b0fa3390.tar.gz Qt-f39c9f38276add6ead9bb5d380cc2b32b0fa3390.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'qmake/generators/metamakefile.cpp')
| -rw-r--r-- | qmake/generators/metamakefile.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp index ad8750b..e98831d 100644 --- a/qmake/generators/metamakefile.cpp +++ b/qmake/generators/metamakefile.cpp @@ -529,9 +529,18 @@ MetaMakefileGenerator::modesForGenerator(const QString &gen, *host_mode = Option::HOST_UNIX_MODE; *target_mode = Option::TARG_UNIX_MODE; #endif - } else if (gen == "MSVC.NET" || gen == "MINGW" || gen == "BMAKE" || gen == "MSBUILD") { + } else if (gen == "MSVC.NET" || gen == "BMAKE" || gen == "MSBUILD") { *host_mode = Option::HOST_WIN_MODE; *target_mode = Option::TARG_WIN_MODE; + } else if (gen == "MINGW") { +#if defined(Q_OS_MAC) + *host_mode = Option::HOST_MACX_MODE; +#elif defined(Q_OS_UNIX) + *host_mode = Option::HOST_UNIX_MODE; +#else + *host_mode = Option::HOST_WIN_MODE; +#endif + *target_mode = Option::TARG_WIN_MODE; } else if (gen == "PROJECTBUILDER" || gen == "XCODE") { *host_mode = Option::HOST_MACX_MODE; *target_mode = Option::TARG_MACX_MODE; |