AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename msvc11 to msvc2012

Browse Source 
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>
This commit is contained in:
Andreas Holzammer 2012-08-07 19:12:41 +02:00 committed by Qt by Nokia
parent f829ab5573
commit 495017e5d4
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mkspecs/win32-msvc11/qmake.conf → mkspecs/win32-msvc2012/qmake.conf
View File

@ -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 MAKEFILE_GENERATOR = MSBUILD

0
mkspecs/win32-msvc11/qplatformdefs.h → mkspecs/win32-msvc2012/qplatformdefs.h
View File

4
qmake/Makefile.win32
View File

@ -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)" == "" !if "$(SOURCE_PATH)" == ""
SOURCE_PATH = .. SOURCE_PATH = ..
@ -26,7 +26,7 @@ LINK = link
# #
!if "$(QMAKESPEC)" == "win32-msvc2005" !if "$(QMAKESPEC)" == "win32-msvc2005"
CFLAGS_EXTRA = /Zc:wchar_t- 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 CFLAGS_EXTRA = /MP
!endif !endif

2
tools/configure/configureapp.cpp
View File

@ -1230,7 +1230,7 @@ void Configure::parseCmdLine()
dictionary[ "QMAKESPEC" ].endsWith("-msvc2005") || dictionary[ "QMAKESPEC" ].endsWith("-msvc2005") ||
dictionary[ "QMAKESPEC" ].endsWith("-msvc2008") || dictionary[ "QMAKESPEC" ].endsWith("-msvc2008") ||
dictionary[ "QMAKESPEC" ].endsWith("-msvc2010") || dictionary[ "QMAKESPEC" ].endsWith("-msvc2010") ||
dictionary[ "QMAKESPEC" ].endsWith("-msvc11")) { dictionary[ "QMAKESPEC" ].endsWith("-msvc2012")) {
if (dictionary[ "MAKE" ].isEmpty()) dictionary[ "MAKE" ] = "nmake"; if (dictionary[ "MAKE" ].isEmpty()) dictionary[ "MAKE" ] = "nmake";
dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32"; dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32";
} else if (dictionary[ "QMAKESPEC" ] == QString("win32-g++")) { } else if (dictionary[ "QMAKESPEC" ] == QString("win32-g++")) {

8
tools/configure/environment.cpp
View File

@ -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_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\\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_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_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_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\\Wow6432Node\\Microsoft\\VisualStudio\\SxS\\VC7\\11.0", "cl.exe"}, // link.exe, lib.exe
{CC_UNKNOWN, "Unknown", 0, 0}, {CC_UNKNOWN, "Unknown", 0, 0},
}; };
@ -110,8 +110,8 @@ QString Environment::detectQMakeSpec()
{ {
QString spec; QString spec;
switch (detectCompiler()) { switch (detectCompiler()) {
case CC_NET11: case CC_NET2012:
spec = "win32-msvc11"; spec = "win32-msvc2012";
break; break;
case CC_NET2010: case CC_NET2010:
spec = "win32-msvc2010"; spec = "win32-msvc2010";

2
tools/configure/environment.h
View File

@ -54,7 +54,7 @@ enum Compiler {
CC_NET2005 = 0x80, CC_NET2005 = 0x80,
CC_NET2008 = 0x90, CC_NET2008 = 0x90,
CC_NET2010 = 0xA0, CC_NET2010 = 0xA0,
CC_NET11 = 0xB0 CC_NET2012 = 0xB0
}; };
struct CompilerInfo; struct CompilerInfo;