diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-11 15:14:13 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-11 16:42:01 +0200 |
commit | 3ef6cf060e984bca43956a23b61b32ec7347cfc7 (patch) | |
tree | 14810e4d0168c0cc3d69cb286574bf28375c07bc /tools | |
parent | b06304e164ba47351fa292662c1e6383c081b5ca (diff) | |
parent | 7b9d6cf844ece18fef884f51117e25ad4ac31db5 (diff) |
Merge branch 'stable' into dev
Conflicts:
qmake/generators/mac/pbuilder_pbx.cpp
src/corelib/json/qjsonwriter.cpp
src/corelib/kernel/qeventdispatcher_blackberry.cpp
src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
Change-Id: I24df576c4cbd18fa51b03122f71e32bb83b9028f
Diffstat (limited to 'tools')
-rw-r--r-- | tools/configure/configureapp.cpp | 4 | ||||
-rw-r--r-- | tools/configure/environment.cpp | 7 | ||||
-rw-r--r-- | tools/configure/environment.h | 3 |
3 files changed, 12 insertions, 2 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index dfa89d36f9..c836e0e851 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1327,7 +1327,8 @@ void Configure::parseCmdLine() dictionary[ "QMAKESPEC" ].endsWith("-msvc2005") || dictionary[ "QMAKESPEC" ].endsWith("-msvc2008") || dictionary[ "QMAKESPEC" ].endsWith("-msvc2010") || - dictionary[ "QMAKESPEC" ].endsWith("-msvc2012")) { + dictionary[ "QMAKESPEC" ].endsWith("-msvc2012") || + dictionary[ "QMAKESPEC" ].endsWith("-msvc2013")) { if (dictionary[ "MAKE" ].isEmpty()) dictionary[ "MAKE" ] = "nmake"; dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32"; } else if (dictionary[ "QMAKESPEC" ] == QString("win32-g++")) { @@ -1620,6 +1621,7 @@ void Configure::applySpecSpecifics() } else if ((platform() == QNX) || (platform() == BLACKBERRY)) { dictionary["STACK_PROTECTOR_STRONG"] = "auto"; dictionary["SLOG2"] = "auto"; + dictionary["QT_XKBCOMMON"] = "no"; } else if (platform() == ANDROID) { dictionary[ "REDUCE_EXPORTS" ] = "yes"; dictionary[ "BUILD" ] = "release"; diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp index 1b4053ccdf..d733165271 100644 --- a/tools/configure/environment.cpp +++ b/tools/configure/environment.cpp @@ -86,6 +86,8 @@ struct CompilerInfo{ {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_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}, }; @@ -111,6 +113,9 @@ QString Environment::detectQMakeSpec() { QString spec; switch (detectCompiler()) { + case CC_NET2013: + spec = "win32-msvc2013"; + break; case CC_NET2012: spec = "win32-msvc2012"; break; @@ -144,6 +149,8 @@ QString Environment::detectQMakeSpec() Compiler Environment::compilerFromQMakeSpec(const QString &qmakeSpec) { + if (qmakeSpec == QLatin1String("win32-msvc2013")) + return CC_NET2013; if (qmakeSpec == QLatin1String("win32-msvc2012")) return CC_NET2012; if (qmakeSpec == QLatin1String("win32-msvc2010")) diff --git a/tools/configure/environment.h b/tools/configure/environment.h index d1e31f6955..cef0bca29f 100644 --- a/tools/configure/environment.h +++ b/tools/configure/environment.h @@ -53,7 +53,8 @@ enum Compiler { CC_NET2005 = 0x80, CC_NET2008 = 0x90, CC_NET2010 = 0xA0, - CC_NET2012 = 0xB0 + CC_NET2012 = 0xB0, + CC_NET2013 = 0xC0 }; struct CompilerInfo; |