diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-06-17 00:29:02 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-06-17 00:29:02 (GMT) |
| commit | 5ae513c05a1b844745cc80834dac43f16bf62092 (patch) | |
| tree | b93601dd5daf3b18091069791c7d10057ffd7a92 /qmake/generators/metamakefile.cpp | |
| parent | 7a577ff67388413a882435c5cbd1ad6d1fa8393d (diff) | |
| parent | 7b30a66b2f16a8bf8828d26b7d0b193b5dffe713 (diff) | |
| download | Qt-5ae513c05a1b844745cc80834dac43f16bf62092.zip Qt-5ae513c05a1b844745cc80834dac43f16bf62092.tar.gz Qt-5ae513c05a1b844745cc80834dac43f16bf62092.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml 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; |