summaryrefslogtreecommitdiffstats
path: root/tools/configure/environment.h
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2014-06-19 15:52:49 -0700
committerThiago Macieira <thiago.macieira@intel.com>2014-12-13 05:11:25 +0100
commitce1c53b4130495b17addc45bf3f5b2a2dc052507 (patch)
tree7d964a0391a022fe99a0ee87b5547de8359f3aa7 /tools/configure/environment.h
parentc23d1c76953704ecb52c833d7ef1de2e2f89b1e6 (diff)
Add detection of and support for Visual Studio 2015
Tested with the Preview release of November 2014. Differences to the 2013 detection and support: - Option -Zc:strictStrings is present in both debug and release mode and is passed to qmake's own build - New warnings 4456, 4457 and 4458 (shadowing) are disabled - Compiler supports -arch:AVX2 Change-Id: I9572ff4d4aded4004c1fa5d6f13ffee5462043d6 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'tools/configure/environment.h')
-rw-r--r--tools/configure/environment.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/configure/environment.h b/tools/configure/environment.h
index 446f5212f7..8d2aed13f1 100644
--- a/tools/configure/environment.h
+++ b/tools/configure/environment.h
@@ -45,7 +45,8 @@ enum Compiler {
CC_MSVC2008 = 0x90,
CC_MSVC2010 = 0xA0,
CC_MSVC2012 = 0xB0,
- CC_MSVC2013 = 0xC0
+ CC_MSVC2013 = 0xC0,
+ CC_MSVC2015 = 0xD0
};
struct CompilerInfo;