diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-19 13:25:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-19 16:12:34 +0200 |
| commit | ce09ef431373f45d14ce0a6e7de24aee3666093d (patch) | |
| tree | 7c998b21f02db55e233e7eeb1599663f1c6b51ca /qmake/generators/win32/msvc_objectmodel.cpp | |
| parent | 7ad55ca65f42351e231f31f7a9253ae6eaf1ebb3 (diff) | |
| parent | 97eec16e4ff6367c233f8ea6c4a343c286c3a514 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/corelib/io/qprocess_unix.cpp
src/corelib/io/qprocess_win.cpp
src/plugins/platforms/android/qandroidplatformintegration.h
src/plugins/platforms/windows/qwindowscontext.cpp
src/plugins/platforms/windows/windows.pri
src/tools/uic/cpp/cppwriteinitialization.cpp
src/widgets/doc/src/widgets-and-layouts/gallery.qdoc
Change-Id: I8d0834c77f350ea7540140c2c7f372814afc2d0f
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 0d1a294b285..300792c5af4 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) { |