diff options
| author | Martin Petersson <martin.petersson@nokia.com> | 2010-03-03 17:18:09 (GMT) |
|---|---|---|
| committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2010-04-21 10:31:11 (GMT) |
| commit | cd601ef53385962c4affdb2020cfcb415d117bc1 (patch) | |
| tree | f49d98fea77c3a9dd4319f005f220ec53a5cf90b /qmake/generators/metamakefile.cpp | |
| parent | 69c4893008ccd4f89bf190c6ca930363b9d65efc (diff) | |
| download | Qt-cd601ef53385962c4affdb2020cfcb415d117bc1.zip Qt-cd601ef53385962c4affdb2020cfcb415d117bc1.tar.gz Qt-cd601ef53385962c4affdb2020cfcb415d117bc1.tar.bz2 | |
Add support for MSBuild, which is the project format for MSVC 2010
Reviewed-by: Marius SO
Diffstat (limited to 'qmake/generators/metamakefile.cpp')
| -rw-r--r-- | qmake/generators/metamakefile.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp index c42a837..f42a489 100644 --- a/qmake/generators/metamakefile.cpp +++ b/qmake/generators/metamakefile.cpp @@ -443,6 +443,7 @@ QT_BEGIN_INCLUDE_NAMESPACE #include "msvc_nmake.h" #include "borland_bmake.h" #include "msvc_vcproj.h" +#include "msvc_vcxproj.h" #include "symmake_abld.h" #include "symmake_sbsv2.h" #include "symbian_makefile.h" @@ -473,6 +474,12 @@ MetaMakefileGenerator::createMakefileGenerator(QMakeProject *proj, bool noIO) mkfile = new VcprojGenerator; else mkfile = new NmakeMakefileGenerator; + } else if(gen == "MSBUILD") { + // Visual Studio >= v11.0 + if(proj->first("TEMPLATE").indexOf(QRegExp("^vc.*")) != -1 || proj->first("TEMPLATE").indexOf(QRegExp("^ce.*")) != -1) + mkfile = new VcxprojGenerator; + else + mkfile = new NmakeMakefileGenerator; } else if(gen == "BMAKE") { mkfile = new BorlandMakefileGenerator; } else if(gen == "SYMBIAN_ABLD") { |