summaryrefslogtreecommitdiffstats
path: root/qmake/generators/win32/msvc_objectmodel.cpp
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2018-11-22 09:26:09 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2018-11-24 20:12:01 +0000
commite824136a3b850e7b2760bbef7b9572332ca4a285 (patch)
tree934b975e88fba30e1ea5012e0e3efb52c9b6a2b6 /qmake/generators/win32/msvc_objectmodel.cpp
parentb1a9a7794f51dd214e884fe331c5d1009972a48e (diff)
Rename VcProjGenerator::[autogen]precompCPP to [autogen]precompSource
Those names are a better fit as we want to support C precompiled headers in a subsequent commit. Change-Id: Ie3f852da945b9b2cf0e363c81f1a4b3063f27372 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'qmake/generators/win32/msvc_objectmodel.cpp')
-rw-r--r--qmake/generators/win32/msvc_objectmodel.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index 4f0cee65e1..442010a3a9 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -2213,8 +2213,8 @@ void VCFilter::addFiles(const ProStringList& fileList)
void VCFilter::modifyPCHstage(QString str)
{
- bool autogenSourceFile = Project->autogenPrecompCPP;
- bool pchThroughSourceFile = !Project->precompCPP.isEmpty();
+ bool autogenSourceFile = Project->autogenPrecompSource;
+ bool pchThroughSourceFile = !Project->precompSource.isEmpty();
bool isCFile = false;
for (QStringList::Iterator it = Option::c_ext.begin(); it != Option::c_ext.end(); ++it) {
if (str.endsWith(*it)) {
@@ -2223,7 +2223,7 @@ void VCFilter::modifyPCHstage(QString str)
}
}
const bool isHFile = (str == Project->precompH);
- bool isCPPFile = pchThroughSourceFile && (str == Project->precompCPP);
+ bool isCPPFile = pchThroughSourceFile && (str == Project->precompSource);
if(!isCFile && !isHFile && !isCPPFile)
return;
@@ -2231,7 +2231,7 @@ void VCFilter::modifyPCHstage(QString str)
if(isHFile && pchThroughSourceFile) {
if (autogenSourceFile) {
useCustomBuildTool = true;
- QString toFile(Project->precompCPP);
+ QString toFile(Project->precompSource);
CustomBuildTool.Description = "Generating precompiled header source file '" + toFile + "' ...";
CustomBuildTool.Outputs += toFile;