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/configure/environment.h | |
| 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/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 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; |