diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-04-28 08:14:11 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-04-28 08:14:11 (GMT) |
| commit | 36bd47429312f6d78d620c04bb7e62d34273d310 (patch) | |
| tree | dea54adff0ec870a88d96e7e3bb00b9657175412 /qmake/generators/metamakefile.cpp | |
| parent | 00ebbeb5c319957d5671130313da3c5485e0f31c (diff) | |
| parent | 2737386ebcb99715d3198a91b5951415c24f99aa (diff) | |
| download | Qt-36bd47429312f6d78d620c04bb7e62d34273d310.zip Qt-36bd47429312f6d78d620c04bb7e62d34273d310.tar.gz Qt-36bd47429312f6d78d620c04bb7e62d34273d310.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'qmake/generators/metamakefile.cpp')
| -rw-r--r-- | qmake/generators/metamakefile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp index f42a489..9c64544 100644 --- a/qmake/generators/metamakefile.cpp +++ b/qmake/generators/metamakefile.cpp @@ -529,7 +529,7 @@ 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") { + } else if (gen == "MSVC.NET" || gen == "MINGW" || gen == "BMAKE" || gen == "MSBUILD") { *host_mode = Option::HOST_WIN_MODE; *target_mode = Option::TARG_WIN_MODE; } else if (gen == "PROJECTBUILDER" || gen == "XCODE") { |