diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-15 01:00:50 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-15 01:00:51 +0100 |
| commit | ef2ddcf551dec13215cb45cb000731f94b2f8e34 (patch) | |
| tree | c8810f6ee77a81c3003ccc8783c9d3b17f0b8a5e /qmake/generators/win32/msvc_objectmodel.cpp | |
| parent | e2cf6ade3535467bc2f21b54b82ed007d5ce279b (diff) | |
| parent | 501cca2c4b0851cea7133ba56c3a05d71c25ce6d (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I8cad26f17834dbc9f7151edc0f17786f9e32025d
Diffstat (limited to 'qmake/generators/win32/msvc_objectmodel.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 7caa94c512..cf0b96ec9f 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -55,7 +55,8 @@ static DotNET vsVersionFromString(const char *versionString) { "11.0", NET2012 }, { "12.0", NET2013 }, { "14.0", NET2015 }, - { "15.0", NET2017 } + { "15.0", NET2017 }, + { "16.0", NET2019 } }; DotNET result = NETUnknown; for (const auto entry : mapping) { |