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

Remove variable autogenSourceFile from VCFilter::modifyPCHstage

Browse Source 
There's no point in having it, and this will reduce the diff of a
subsequent commit.

Change-Id: I3d27d6808c585b87a44df2499f2fcea4331befbb
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
This commit is contained in:
Joerg Bornemann 2018-11-22 11:07:16 +01:00
parent e824136a3b
commit 54fc1b5ae6
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2213,7 +2213,6 @@ void VCFilter::addFiles(const ProStringList& fileList)
void VCFilter::modifyPCHstage(QString str) void VCFilter::modifyPCHstage(QString str)
{ {
bool autogenSourceFile = Project->autogenPrecompSource;
bool pchThroughSourceFile = !Project->precompSource.isEmpty(); bool pchThroughSourceFile = !Project->precompSource.isEmpty();
bool isCFile = false; bool isCFile = false;
for (QStringList::Iterator it = Option::c_ext.begin(); it != Option::c_ext.end(); ++it) { for (QStringList::Iterator it = Option::c_ext.begin(); it != Option::c_ext.end(); ++it) {
@ -2229,7 +2228,7 @@ void VCFilter::modifyPCHstage(QString str)
return; return;
if(isHFile && pchThroughSourceFile) { if(isHFile && pchThroughSourceFile) {
if (autogenSourceFile) { if (Project->autogenPrecompSource) {
useCustomBuildTool = true; useCustomBuildTool = true;
QString toFile(Project->precompSource); QString toFile(Project->precompSource);
CustomBuildTool.Description = "Generating precompiled header source file '" + toFile + "' ..."; CustomBuildTool.Description = "Generating precompiled header source file '" + toFile + "' ...";
@ -2266,7 +2265,7 @@ void VCFilter::modifyPCHstage(QString str)
CompilerTool.UsePrecompiledHeader = (isCFile ? pchNone : pchCreateUsingSpecific); CompilerTool.UsePrecompiledHeader = (isCFile ? pchNone : pchCreateUsingSpecific);
if (isCFile) if (isCFile)
CompilerTool.PrecompiledHeaderThrough = QLatin1String("$(NOINHERIT)"); CompilerTool.PrecompiledHeaderThrough = QLatin1String("$(NOINHERIT)");
else if (autogenSourceFile) else if (Project->autogenPrecompSource)
CompilerTool.PrecompiledHeaderThrough = Project->precompHFilename; CompilerTool.PrecompiledHeaderThrough = Project->precompHFilename;
CompilerTool.ForcedIncludeFiles = QStringList("$(NOINHERIT)"); CompilerTool.ForcedIncludeFiles = QStringList("$(NOINHERIT)");
} }