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>

diff --git a/mkspecs/win32-msvc11/qmake.conf b/mkspecs/win32-msvc2012/qmake.conf
similarity index 97%
rename from mkspecs/win32-msvc11/qmake.conf
rename to mkspecs/win32-msvc2012/qmake.conf
index ef18425..a4c2002 100644 (file)
--- a/mkspecs/win32-msvc11/qmake.conf
+++ b/mkspecs/win32-msvc2012/qmake.conf
@@ -1,7 +1,7 @@
 #
-# qmake configuration for win32-msvc11
+# qmake configuration for win32-msvc2012
 #
-# Written for Microsoft Visual C++ 11
+# Written for Microsoft Visual C++ 2012
 #
 
 MAKEFILE_GENERATOR      = MSBUILD

diff --git a/mkspecs/win32-msvc11/qplatformdefs.h b/mkspecs/win32-msvc2012/qplatformdefs.h
similarity index 100%
rename from mkspecs/win32-msvc11/qplatformdefs.h
rename to mkspecs/win32-msvc2012/qplatformdefs.h

diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32
index c19fbcc..5780a78 100644 (file)
--- a/qmake/Makefile.win32
+++ b/qmake/Makefile.win32
@@ -1,4 +1,4 @@
-!IF "$(QMAKESPEC)" == "win32-msvc" || "$(QMAKESPEC)" == "win32-msvc.net" || "$(QMAKESPEC)" == "win32-msvc2002" || "$(QMAKESPEC)" == "win32-msvc2003" || "$(QMAKESPEC)" == "win32-msvc2005" || "$(QMAKESPEC)" == "win32-msvc2008" || "$(QMAKESPEC)" == "win32-msvc2010" || "$(QMAKESPEC)" == "win32-msvc11" || "$(QMAKESPEC)" == "win32-icc"
+!IF "$(QMAKESPEC)" == "win32-msvc" || "$(QMAKESPEC)" == "win32-msvc.net" || "$(QMAKESPEC)" == "win32-msvc2002" || "$(QMAKESPEC)" == "win32-msvc2003" || "$(QMAKESPEC)" == "win32-msvc2005" || "$(QMAKESPEC)" == "win32-msvc2008" || "$(QMAKESPEC)" == "win32-msvc2010" || "$(QMAKESPEC)" == "win32-msvc2012" || "$(QMAKESPEC)" == "win32-icc"
 
 !if "$(SOURCE_PATH)" == ""
 SOURCE_PATH = ..
@@ -26,7 +26,7 @@ LINK      = link
 #
 !if "$(QMAKESPEC)" == "win32-msvc2005"
 CFLAGS_EXTRA      = /Zc:wchar_t-
-!elseif "$(QMAKESPEC)" == "win32-msvc2008" || "$(QMAKESPEC)" == "win32-msvc2010" || "$(QMAKESPEC)" == "win32-msvc11"
+!elseif "$(QMAKESPEC)" == "win32-msvc2008" || "$(QMAKESPEC)" == "win32-msvc2010" || "$(QMAKESPEC)" == "win32-msvc2012"
 CFLAGS_EXTRA      = /MP
 !endif
 

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index d0db503..126edb9 100644 (file)
--- 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 45dc9d9..c751191 100644 (file)
--- 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 58e9c18..51a6c6f 100644 (file)
--- 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;