summaryrefslogtreecommitdiffstats
path: root/tools/configure/configure.pro
diff options
context:
space:
mode:
authorPeter Kümmel <syntheticpp@gmx.net>2012-09-14 09:24:18 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-09-17 15:00:39 (GMT)
commit370a8f0c2678e5a5a688eaa22e27d98ca8f1d82d (patch)
tree64d00133ca0699a932f71ec671d5362c90be716d /tools/configure/configure.pro
parent1df4b49a182dbff10ea7753009a33dca86ba436a (diff)
downloadQt-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/configure.pro')
-rw-r--r--tools/configure/configure.pro1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/configure/configure.pro b/tools/configure/configure.pro
index 542c740..dab29b0 100644
--- a/tools/configure/configure.pro
+++ b/tools/configure/configure.pro
@@ -19,6 +19,7 @@ win32-msvc* {
QMAKE_CXXFLAGS_DEBUG -= -MDd
QMAKE_CXXFLAGS_DEBUG += -MTd
}
+win32-msvc2012: DEFINES += _ALLOW_KEYWORD_MACROS
PRECOMPILED_HEADER = configure_pch.h