diff options
author | Liang Qi <liang.qi@qt.io> | 2017-06-20 04:28:09 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-06-20 04:28:09 +0000 |
commit | d1ff9b419da5e3ace68479b02582222486ec9703 (patch) | |
tree | a978de6c9844cf37bbd7dc5cecc298bf51f4dce3 /qmake/generators/win32/msvc_objectmodel.cpp | |
parent | 8a4ea3f03807c4d75ef73609dae30cfcf427c3ea (diff) | |
parent | ce09ef431373f45d14ce0a6e7de24aee3666093d (diff) |
Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev
Diffstat (limited to 'qmake/generators/win32/msvc_objectmodel.cpp')
-rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 0d1a294b28..300792c5af 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -47,15 +47,15 @@ static DotNET vsVersionFromString(const char *versionString) DotNET version; }; static VSVersionMapping mapping[] = { - "7.0", NET2002, - "7.1", NET2003, - "8.0", NET2005, - "9.0", NET2008, - "10.0", NET2010, - "11.0", NET2012, - "12.0", NET2013, - "14.0", NET2015, - "15.0", NET2017 + { "7.0", NET2002 }, + { "7.1", NET2003 }, + { "8.0", NET2005 }, + { "9.0", NET2008 }, + { "10.0", NET2010 }, + { "11.0", NET2012 }, + { "12.0", NET2013 }, + { "14.0", NET2015 }, + { "15.0", NET2017 } }; DotNET result = NETUnknown; for (const auto entry : mapping) { |