diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-07-02 13:48:08 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-21 09:37:46 +0100 |
| commit | 682ed9df439481e1f8e8651c4aa06f1b455a2080 (patch) | |
| tree | a64a2ee5e23cbd676a75b1f3813f3050e23e6630 /tools | |
| parent | 248918b03fcbe6e20d1f8e757e3430bbf0f20d47 (diff) | |
| download | qt4-tools-682ed9df439481e1f8e8651c4aa06f1b455a2080.tar.gz | |
add support for Visual Studio 2013
Add mkspec win32-msvc2013 and make VS 2013 known to configure and
qmake.
Task-number: QTBUG-36135
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from commit f1cdd4b2976706c6d9c3166a75afff6ec5856f3d)
Change-Id: I6a6d1ce0de0ba85e1b711976c7340893c58e29ae
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 3 | ||||
| -rw-r--r-- | tools/configure/environment.cpp | 5 | ||||
| -rw-r--r-- | tools/configure/environment.h | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index bd7d54af49..964d0e3da4 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1374,7 +1374,8 @@ void Configure::parseCmdLine() qmakeSpec.endsWith("-msvc2005") || qmakeSpec.endsWith("-msvc2008") || qmakeSpec.endsWith("-msvc2010") || - qmakeSpec.endsWith("-msvc2012")) { + qmakeSpec.endsWith("-msvc2012") || + qmakeSpec.endsWith("-msvc2013")) { if (dictionary[ "MAKE" ].isEmpty()) dictionary[ "MAKE" ] = "nmake"; dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32"; } else if (qmakeSpec.contains("win32-g++")) { diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp index 34aa78ceab..7331e031b1 100644 --- a/tools/configure/environment.cpp +++ b/tools/configure/environment.cpp @@ -82,6 +82,8 @@ struct CompilerInfo{ {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_NET2012, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2012 (11.0)", "Software\\Microsoft\\VisualStudio\\SxS\\VC7\\11.0", "cl.exe"}, // link.exe, lib.exe {CC_NET2012, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2012 (11.0)", "Software\\Wow6432Node\\Microsoft\\VisualStudio\\SxS\\VC7\\11.0", "cl.exe"}, // link.exe, lib.exe + {CC_NET2013, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2013 (12.0)", "Software\\Microsoft\\VisualStudio\\SxS\\VC7\\12.0", "cl.exe"}, // link.exe, lib.exe + {CC_NET2013, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2013 (12.0)", "Software\\Wow6432Node\\Microsoft\\VisualStudio\\SxS\\VC7\\12.0", "cl.exe"}, // link.exe, lib.exe {CC_UNKNOWN, "Unknown", 0, 0}, }; @@ -107,6 +109,9 @@ QString Environment::detectQMakeSpec() { QString spec; switch (detectCompiler()) { + case CC_NET2013: + spec = "win32-msvc2013"; + break; case CC_NET2012: spec = "win32-msvc2012"; break; diff --git a/tools/configure/environment.h b/tools/configure/environment.h index eabd00a0b4..1b99ce3f27 100644 --- a/tools/configure/environment.h +++ b/tools/configure/environment.h @@ -55,7 +55,8 @@ enum Compiler { CC_NET2005 = 0x80, CC_NET2008 = 0x90, CC_NET2010 = 0xA0, - CC_NET2012 = 0xB0 + CC_NET2012 = 0xB0, + CC_NET2013 = 0xC0 }; struct CompilerInfo; |