diff options
| author | Andreas Holzammer <andreas.holzammer@kdab.com> | 2012-08-07 19:12:41 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-07 23:27:17 +0200 |
| commit | 495017e5d40e5c3310e35b8897644c7d39e32ad4 (patch) | |
| tree | 822b43c855e1b00b6997c18ac8414aff60ae31cc /tools | |
| parent | f829ab5573f7146785c79d83182757043b0e6ce9 (diff) | |
| download | qtbase-495017e5d40e5c3310e35b8897644c7d39e32ad4.tar.gz | |
Rename msvc11 to msvc2012
Microsoft has named their new Visual Studio again
after the old naming schema.
Change-Id: Ib1b971807fa89d90b10892a2d78570058e564f3a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 2 | ||||
| -rw-r--r-- | tools/configure/environment.cpp | 8 | ||||
| -rw-r--r-- | tools/configure/environment.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index d0db503d90..126edb966b 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1230,7 +1230,7 @@ void Configure::parseCmdLine() dictionary[ "QMAKESPEC" ].endsWith("-msvc2005") || dictionary[ "QMAKESPEC" ].endsWith("-msvc2008") || dictionary[ "QMAKESPEC" ].endsWith("-msvc2010") || - dictionary[ "QMAKESPEC" ].endsWith("-msvc11")) { + dictionary[ "QMAKESPEC" ].endsWith("-msvc2012")) { if (dictionary[ "MAKE" ].isEmpty()) dictionary[ "MAKE" ] = "nmake"; dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32"; } else if (dictionary[ "QMAKESPEC" ] == QString("win32-g++")) { diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp index 45dc9d9417..c7511919f3 100644 --- a/tools/configure/environment.cpp +++ b/tools/configure/environment.cpp @@ -83,8 +83,8 @@ struct CompilerInfo{ {CC_NET2008, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2008 (9.0)", "Software\\Wow6432Node\\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_NET2010, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2010 (10.0)", "Software\\Wow6432Node\\Microsoft\\VisualStudio\\SxS\\VC7\\10.0", "cl.exe"}, // link.exe, lib.exe - {CC_NET11, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 11 (11.0)", "Software\\Microsoft\\VisualStudio\\SxS\\VC7\\11.0", "cl.exe"}, // link.exe, lib.exe - {CC_NET11, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 11 (11.0)", "Software\\Wow6432Node\\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\\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_UNKNOWN, "Unknown", 0, 0}, }; @@ -110,8 +110,8 @@ QString Environment::detectQMakeSpec() { QString spec; switch (detectCompiler()) { - case CC_NET11: - spec = "win32-msvc11"; + case CC_NET2012: + spec = "win32-msvc2012"; break; case CC_NET2010: spec = "win32-msvc2010"; diff --git a/tools/configure/environment.h b/tools/configure/environment.h index 58e9c18137..51a6c6f031 100644 --- a/tools/configure/environment.h +++ b/tools/configure/environment.h @@ -54,7 +54,7 @@ enum Compiler { CC_NET2005 = 0x80, CC_NET2008 = 0x90, CC_NET2010 = 0xA0, - CC_NET11 = 0xB0 + CC_NET2012 = 0xB0 }; struct CompilerInfo; |