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 /tools/configure/environment.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 'tools/configure/environment.cpp')
| -rw-r--r-- | tools/configure/environment.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp index 60b8dcc..943a8a2 100644 --- a/tools/configure/environment.cpp +++ b/tools/configure/environment.cpp @@ -80,6 +80,7 @@ struct CompilerInfo{ {CC_NET2003, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2003 (7.1)", "Software\\Microsoft\\VisualStudio\\7.1\\Setup\\VC\\ProductDir", "cl.exe"}, // link.exe, lib.exe {CC_NET2005, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2005 (8.0)", "Software\\Microsoft\\VisualStudio\\SxS\\VC7\\8.0", "cl.exe"}, // link.exe, lib.exe {CC_NET2008, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2008 (9.0)", "Software\\Microsoft\\VisualStudio\\SxS\\VC7\\9.0", "cl.exe"}, // link.exe, lib.exe + {CC_NET2010, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2010 (10.0)", "Software\\Microsoft\\VisualStudio\\SxS\\VC7\\10.0", "cl.exe"}, // link.exe, lib.exe {CC_UNKNOWN, "Unknown", 0, 0}, }; @@ -105,6 +106,9 @@ QString Environment::detectQMakeSpec() { QString spec; switch (detectCompiler()) { + case CC_NET2010: + spec = "win32-msvc2010"; + break; case CC_NET2008: spec = "win32-msvc2008"; break; |