whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove superfluous calls to which_dotnet_version 

On the way to get rid of this function.
Have one place to determine the VS version instead of calling
this function over and over again (even though all calls but
the first are cheap).

Change-Id: Ic42a65df5a9bbe289f4813e4db85000dba15e672
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
bb10
Joerg Bornemann 2016-11-10 09:12:38 +01:00
parent 19a16a8229
commit 6ad1012758
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qmake/generators/win32/msvc_vcproj.cpp
View File

@ -611,7 +611,7 @@ void VcprojGenerator::writeSubDirs(QTextStream &t)
return;
}
switch (which_dotnet_version(project->first("MSVC_VER").toLatin1())) {
switch (vcProject.Configuration.CompilerVersion) {
case NET2015:
t << _slnHeader140;
break;
@ -638,7 +638,8 @@ void VcprojGenerator::writeSubDirs(QTextStream &t)
break;
default:
t << _slnHeader70;
warn_msg(WarnLogic, "Generator: MSVC.NET: Unknown version (%d) of MSVC detected for .sln", which_dotnet_version());
warn_msg(WarnLogic, "Generator: MSVC.NET: Unknown version (%d) of MSVC detected for .sln",
vcProject.Configuration.CompilerVersion);
break;
}
@ -932,7 +933,7 @@ void VcprojGenerator::initProject()
// Own elements -----------------------------
vcProject.Name = project->first("QMAKE_ORIG_TARGET").toQString();
switch (which_dotnet_version(project->first("MSVC_VER").toLatin1())) {
switch (vcProject.Configuration.CompilerVersion) {
case NET2015:
vcProject.Version = "14.00";
break;
@ -961,7 +962,7 @@ void VcprojGenerator::initProject()
break;
default:
vcProject.Version = "7.00";
warn_msg(WarnLogic, "Generator: MSVC.NET: Unknown version (%d) of MSVC detected for .vcproj", which_dotnet_version());
warn_msg(WarnLogic, "Generator: MSVC.NET: Unknown version (%d) of MSVC detected for .vcproj", vcProject.Configuration.CompilerVersion);
break;
}