diff options
author | Peter Kümmel <syntheticpp@gmx.net> | 2012-09-14 09:24:18 (GMT) |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-17 15:00:39 (GMT) |
commit | 370a8f0c2678e5a5a688eaa22e27d98ca8f1d82d (patch) | |
tree | 64d00133ca0699a932f71ec671d5362c90be716d /tools/configure/configureapp.cpp | |
parent | 1df4b49a182dbff10ea7753009a33dca86ba436a (diff) | |
download | Qt-370a8f0c2678e5a5a688eaa22e27d98ca8f1d82d.zip Qt-370a8f0c2678e5a5a688eaa22e27d98ca8f1d82d.tar.gz Qt-370a8f0c2678e5a5a688eaa22e27d98ca8f1d82d.tar.bz2 |
Add msvc2012 support
The only essential difference to msvc2010 is the define of _ALLOW_KEYWORD_MACROS.
It is a documented breaking change:
http://msdn.microsoft.com/en-us/library/bb531344.aspx
Updated backport of qtbase/1a4f58d3e67f3d271d9e24d7f52950f796542d2f
Change-Id: Iee8b900a214a9e5f289b2139d65f2e00c8113669
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tools/configure/configureapp.cpp')
-rw-r--r-- | tools/configure/configureapp.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index d98b5bb..bc3ee6e 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1344,7 +1344,8 @@ void Configure::parseCmdLine() qmakeSpec.endsWith("-msvc2003") || qmakeSpec.endsWith("-msvc2005") || qmakeSpec.endsWith("-msvc2008") || - qmakeSpec.endsWith("-msvc2010")) { + qmakeSpec.endsWith("-msvc2010") || + qmakeSpec.endsWith("-msvc2012")) { if (dictionary[ "MAKE" ].isEmpty()) dictionary[ "MAKE" ] = "nmake"; dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32"; } else if (qmakeSpec.contains("win32-g++")) { @@ -2346,7 +2347,7 @@ bool Configure::checkAvailability(const QString &part) } else if (part == "WEBKIT") { const QString qmakeSpec = dictionary.value("QMAKESPEC"); available = qmakeSpec == "win32-msvc2005" || qmakeSpec == "win32-msvc2008" || - qmakeSpec == "win32-msvc2010" || qmakeSpec.startsWith("win32-g++"); + qmakeSpec == "win32-msvc2010" || qmakeSpec == "win32-msvc2012" || qmakeSpec.startsWith("win32-g++"); if (dictionary[ "SHARED" ] == "no") { cout << endl << "WARNING: Using static linking will disable the WebKit module." << endl << endl; |