From e04aaf188c735b775dc4483099ec61a9372b0fa8 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Thu, 22 Nov 2018 09:35:38 +0100
Subject: Support 'CONFIG += precompile_header_c' in VS projects

The CONFIG value precompile_header_c was ignored in the VS project
generator. Add a member VcprojGenerator::pchIsCFile that is set to
true if precompile_header_c is active.
The code in modifyPCHstage had to be rearranged to separate the three
parts for stable.h, stable.cpp and other files.

Task-number: QTBUG-62821
Change-Id: I340eb165baa22cafcb64815cf223ce9a21aca558
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
---
 qmake/generators/win32/msvc_objectmodel.cpp | 42 ++++++++++++++++-------------
 1 file changed, 23 insertions(+), 19 deletions(-)

(limited to 'qmake/generators/win32/msvc_objectmodel.cpp')

diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index b9ecb14888..7caa94c512 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -2213,20 +2213,8 @@ void VCFilter::addFiles(const ProStringList& fileList)
 
 void VCFilter::modifyPCHstage(QString str)
 {
-    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)) {
-            isCFile = true;
-            break;
-        }
-    }
     const bool isHFile = (str == Project->precompH);
-    bool isCPPFile = pchThroughSourceFile && (str == Project->precompSource);
-
-    if(!isCFile && !isHFile && !isCPPFile)
-        return;
-
+    const bool pchThroughSourceFile = !Project->precompSource.isEmpty();
     if (isHFile && pchThroughSourceFile && Project->autogenPrecompSource) {
         useCustomBuildTool = true;
         QString toFile(Project->precompSource);
@@ -2259,13 +2247,29 @@ void VCFilter::modifyPCHstage(QString str)
     }
 
     useCompilerTool = true;
-    // Setup PCH options
-    CompilerTool.UsePrecompiledHeader     = (isCFile ? pchNone : pchCreateUsingSpecific);
-    if (isCFile)
+    const bool isPrecompSource = pchThroughSourceFile && (str == Project->precompSource);
+    if (isPrecompSource) {
+        CompilerTool.UsePrecompiledHeader = pchCreateUsingSpecific;
+        if (Project->autogenPrecompSource)
+            CompilerTool.PrecompiledHeaderThrough = Project->precompHFilename;
+        CompilerTool.ForcedIncludeFiles = QStringList("$(NOINHERIT)");
+        return;
+    }
+
+    bool isCFile = false;
+    for (QStringList::Iterator it = Option::c_ext.begin(); it != Option::c_ext.end(); ++it) {
+        if (str.endsWith(*it)) {
+            isCFile = true;
+            break;
+        }
+    }
+
+    bool pchCompatible = (isCFile == Project->pchIsCFile);
+    if (!pchCompatible) {
+        CompilerTool.UsePrecompiledHeader = pchNone;
         CompilerTool.PrecompiledHeaderThrough = QLatin1String("$(NOINHERIT)");
-    else if (Project->autogenPrecompSource)
-        CompilerTool.PrecompiledHeaderThrough = Project->precompHFilename;
-    CompilerTool.ForcedIncludeFiles       = QStringList("$(NOINHERIT)");
+        CompilerTool.ForcedIncludeFiles = QStringList("$(NOINHERIT)");
+    }
 }
 
 VCFilterFile VCFilter::findFile(const QString &filePath, bool *found) const
-- 
cgit v1.2.3