diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-11-11 09:29:17 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-11-11 09:29:17 +0200 |
| commit | 4ee4fc18b4067b90efa46ca9baba74f53b54d9ec (patch) | |
| tree | cc68622c9b85992d99a8373ab55471ee821a4ebf /qmake/generators/win32/msvc_objectmodel.cpp | |
| parent | ab28ff2207e8f33754c79793089dbf943d67736d (diff) | |
| parent | ebb49c66aaf22ed55d62ff7bc3690fce00b7d8ba (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into tqtc/lts-5.15-opensourcev5.15.8-lts-lgpl
Change-Id: I569a2246c9e8d70430e8c5405b9f3df2218078ee
Diffstat (limited to 'qmake/generators/win32/msvc_objectmodel.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 6dca363b76..94df594f40 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -50,6 +50,8 @@ DotNET vsVersionFromString(const ProString &versionString) int versionMajor = versionView.left(idx).toInt(); int versionMinor = versionView.mid(idx + 1).toInt(); + if (versionMajor == 17) + return NET2022; if (versionMajor == 16) return NET2019; if (versionMajor == 15) @@ -2436,6 +2438,7 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info) cmd_name = cmd.left(space); else cmd_name = cmd; + cmd_name = cmd_name.trimmed(); } // Fixify paths |