1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not write empty custom build tool on VCConfiguration level

Browse Source 
This is superfluous.

Change-Id: Iac96938c6a7e899244534747a2f8a60bdbbdeb62
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Joerg Bornemann 2016-11-28 15:03:50 +01:00
parent b83884a4e6
commit 5f6800c220
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2149,7 +2149,6 @@ VCConfiguration::VCConfiguration()
compiler.config = this; compiler.config = this;
linker.config = this; linker.config = this;
idl.config = this; idl.config = this;
custom.config = this;
} }
// VCFilter --------------------------------------------------------- // VCFilter ---------------------------------------------------------
@ -2872,7 +2871,6 @@ void VCProjectWriter::write(XmlOutput &xml, const VCConfiguration &tool)
<< attrE(_UseOfMfc, tool.UseOfMfc) << attrE(_UseOfMfc, tool.UseOfMfc)
<< attrT(_WholeProgramOptimization, tool.WholeProgramOptimization); << attrT(_WholeProgramOptimization, tool.WholeProgramOptimization);
write(xml, tool.compiler); write(xml, tool.compiler);
write(xml, tool.custom);
if (tool.ConfigurationType == typeStaticLibrary) if (tool.ConfigurationType == typeStaticLibrary)
write(xml, tool.librarian); write(xml, tool.librarian);
else else

1
qmake/generators/win32/msvc_objectmodel.h
View File

@ -896,7 +896,6 @@ public:
VCLinkerTool linker; VCLinkerTool linker;
VCLibrarianTool librarian; VCLibrarianTool librarian;
VCManifestTool manifestTool; VCManifestTool manifestTool;
VCCustomBuildTool custom;
VCMIDLTool idl; VCMIDLTool idl;
VCPostBuildEventTool postBuild; VCPostBuildEventTool postBuild;
VCPreBuildEventTool preBuild; VCPreBuildEventTool preBuild;