3 files changed, 29 insertions, 21 deletions

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
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 8c0b801891..6a125ccd77 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -776,7 +776,8 @@ void VcprojGenerator::init()
     // Setup PCH variables
     precompH = project->first("PRECOMPILED_HEADER").toQString();
     precompSource = project->first("PRECOMPILED_SOURCE").toQString();
-    usePCH = !precompH.isEmpty() && project->isActiveConfig("precompile_header");
+    pchIsCFile = project->isActiveConfig("precompile_header_c");
+    usePCH = !precompH.isEmpty() && (pchIsCFile || project->isActiveConfig("precompile_header"));
     if (usePCH) {
         precompHFilename = fileInfo(precompH).fileName();
         // Created files
@@ -793,7 +794,9 @@ void VcprojGenerator::init()
         autogenPrecompSource = precompSource.isEmpty() && project->isActiveConfig("autogen_precompile_source");
         if (autogenPrecompSource) {
             precompSource = precompH
-                + (Option::cpp_ext.count() ? Option::cpp_ext.at(0) : QLatin1String(".cpp"));
+                    + (pchIsCFile
+                       ? (Option::c_ext.count() ? Option::c_ext.at(0) : QLatin1String(".c"))
+                       : (Option::cpp_ext.count() ? Option::cpp_ext.at(0) : QLatin1String(".cpp")));
             project->values("GENERATED_SOURCES") += precompSource;
         } else if (!precompSource.isEmpty()) {
             project->values("SOURCES") += precompSource;
diff --git a/qmake/generators/win32/msvc_vcproj.h b/qmake/generators/win32/msvc_vcproj.h
index fafc69d9ab..6f9743cb09 100644
--- a/qmake/generators/win32/msvc_vcproj.h
+++ b/qmake/generators/win32/msvc_vcproj.h
@@ -66,6 +66,7 @@ public:
     QHash<QString, QString> extraCompilerOutputs;
     const QString customBuildToolFilterFileSuffix;
     bool usePCH;
+    bool pchIsCFile = false;
     VCProjectWriter *projectWriter;
 
 protected: