diff options
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.h | 3 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 8 |
3 files changed, 12 insertions, 1 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 6517e5c4516..0776a4a5267 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -25,6 +25,8 @@ DotNET vsVersionFromString(const ProString &versionString) int versionMajor = versionView.left(idx).toInt(); int versionMinor = versionView.mid(idx + 1).toInt(); + if (versionMajor == 18) + return NET2026; if (versionMajor == 17) return NET2022; if (versionMajor == 16) diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h index 190d6c727fa..58f818a3bc5 100644 --- a/qmake/generators/win32/msvc_objectmodel.h +++ b/qmake/generators/win32/msvc_objectmodel.h @@ -29,7 +29,8 @@ enum DotNET { NET2015 = 0xd0, NET2017 = 0xe0, NET2019, - NET2022 + NET2022, + NET2026 }; DotNET vsVersionFromString(const ProString &versionString); diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 1566f72ba66..7c2e0562aa7 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -56,6 +56,8 @@ const char _slnHeader142[] = "Microsoft Visual Studio Solution File, Format "\n# Visual Studio Version 16"; const char _slnHeader143[] = "Microsoft Visual Studio Solution File, Format Version 12.00" "\n# Visual Studio Version 17"; +const char _slnHeader145[] = "Microsoft Visual Studio Solution File, Format Version 12.00" + "\n# Visual Studio Version 18"; // The following UUID _may_ change for later servicepacks... // If so we need to search through the registry at // HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\7.0\Projects @@ -502,6 +504,9 @@ void VcprojGenerator::writeSubDirs(QTextStream &t) } switch (vcProject.Configuration.CompilerVersion) { + case NET2026: + t << _slnHeader145; + break; case NET2022: t << _slnHeader143; break; @@ -882,6 +887,9 @@ void VcprojGenerator::initProject() // Own elements ----------------------------- vcProject.Name = project->first("QMAKE_ORIG_TARGET").toQString(); switch (vcProject.Configuration.CompilerVersion) { + case NET2026: + vcProject.Version = "18.00"; + break; case NET2022: vcProject.Version = "17.00"; break; |