AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qmake: Recognize MSVC 16.x as VS 2019 in the VS project generator

Browse Source 
In a subsequent comment we will set the qmake variable MSVC_VER to 16.8
to check for the availability of certain compiler flags that were
introduced in that compiler version.

The old code compared exact version strings.  With this patch we're
checking version ranges instead and handle MSVC_VER 16.x as VS 2019.

Pick-to: 6.2 5.15
Task-number: QTBUG-89296
Change-Id: I9ea24a66f68a342a72f5c2a285bafacb8786661b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2021-08-26 11:01:53 +02:00
parent 664a7947be
commit b073de274d
1 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
qmake/generators/win32/msvc_objectmodel.cpp
View File

@ -40,36 +40,40 @@ using namespace QMakeInternal;
QT_BEGIN_NAMESPACE
static DotNET vsVersionFromString(const char *versionString)
{
struct VSVersionMapping
{
const char *str;
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 },
{ "16.0", NET2019 }
};
DotNET result = NETUnknown;
for (const auto entry : mapping) {
if (strcmp(entry.str, versionString) == 0)
return entry.version;
}
return result;
}
DotNET vsVersionFromString(const ProString &versionString)
{
return vsVersionFromString(versionString.toLatin1().constData());
int idx = versionString.indexOf(QLatin1Char('.'));
if (idx == -1)
return NETUnknown;
QStringView versionView = versionString.toQStringView();
int versionMajor = versionView.left(idx).toInt();
int versionMinor = versionView.mid(idx + 1).toInt();
if (versionMajor == 16)
return NET2019;
if (versionMajor == 15)
return NET2017;
if (versionMajor == 14)
return NET2015;
if (versionMajor == 12)
return NET2013;
if (versionMajor == 11)
return NET2012;
if (versionMajor == 10)
return NET2010;
if (versionMajor == 9)
return NET2008;
if (versionMajor == 8)
return NET2005;
if (versionMajor == 7) {
if (versionMinor == 0)
return NET2002;
if (versionMinor == 1)
return NET2003;
}
return NETUnknown;
}
// XML Tags ---------------------------------------------------------