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/environment.h | |
| 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/environment.h')
| -rw-r--r-- | tools/configure/environment.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/configure/environment.h b/tools/configure/environment.h index f300125..57c4be9 100644 --- a/tools/configure/environment.h +++ b/tools/configure/environment.h @@ -54,7 +54,8 @@ enum Compiler { CC_NET2003 = 0x71, CC_NET2005 = 0x80, CC_NET2008 = 0x90, - CC_NET2010 = 0x91 + CC_NET2010 = 0xA0, + CC_NET2012 = 0xB0 }; struct CompilerInfo; |