diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-24 09:09:01 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-24 10:31:21 +0100 |
| commit | 4783de0473a288fdff7e5354c12315ba025ec7e0 (patch) | |
| tree | 1dbd12129b4677c5a02307c1046fdb8cff056324 /tools/configure/environment.h | |
| parent | 60054b5940b19f4dd9780e63da1e2dce45baf131 (diff) | |
| parent | 38c1057f696c4e3f168305091413428d99007c43 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/network/socket/qnativesocketengine_winrt.cpp
tools/configure/configureapp.cpp
tools/configure/environment.cpp
Change-Id: Ieae6f2ee004a87f041751852b687484f91ee4480
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 2ab5b00d1c..aa8e7fd8bc 100644 --- a/tools/configure/environment.h +++ b/tools/configure/environment.h @@ -40,7 +40,8 @@ enum Compiler { CC_MSVC2010 = 0xA0, CC_MSVC2012 = 0xB0, CC_MSVC2013 = 0xC0, - CC_MSVC2015 = 0xD0 + CC_MSVC2015 = 0xD0, + CC_MSVC2017 = 0xE0 }; struct CompilerInfo; |