Clang: Take precompiled headers into account when parsing source files

Task-number: QTCREATORBUG-15590
Change-Id: Icbfce4ffd6e9f9802641d35d898fa1dc1c4c18ee
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>

src/plugins/cpptools/compileroptionsbuilder.cpp

@@ -112,7 +112,7 @@ void CompilerOptionsBuilder::enableExceptions()
 void CompilerOptionsBuilder::addHeaderPathOptions()
 {
     typedef ProjectPartHeaderPath HeaderPath;
-    const QString defaultPrefix = includeOption();
+    const QString defaultPrefix = includeDirOption();
 
     QStringList result;
 
@@ -141,6 +141,24 @@ void CompilerOptionsBuilder::addHeaderPathOptions()
     m_options.append(result);
 }
 
+void CompilerOptionsBuilder::addPrecompiledHeaderOptions(PchUsage pchUsage)
+{
+    if (pchUsage == PchUsage::None)
+        return;
+
+    QStringList result;
+
+    const QString includeOptionString = includeOption();
+    foreach (const QString &pchFile, m_projectPart.precompiledHeaders) {
+        if (QFile::exists(pchFile)) {
+            result += includeOptionString;
+            result += QDir::toNativeSeparators(pchFile);
+        }
+    }
+
+    m_options.append(result);
+}
+
 void CompilerOptionsBuilder::addToolchainAndProjectDefines()
 {
     addDefines(m_projectPart.toolchainDefines);
@@ -376,7 +394,7 @@ void CompilerOptionsBuilder::addDefineFloat128ForMingw()
         addDefine("#define __float128 void");
 }
 
-QString CompilerOptionsBuilder::includeOption() const
+QString CompilerOptionsBuilder::includeDirOption() const
 {
     return QLatin1String("-I");
 }
@@ -399,6 +417,11 @@ QString CompilerOptionsBuilder::undefineOption() const
     return QLatin1String("-U");
 }
 
+QString CompilerOptionsBuilder::includeOption() const
+{
+    return QLatin1String("-include");
+}
+
 static bool isGccOrMinGwToolchain(const Core::Id &toolchainType)
 {
     return toolchainType == ProjectExplorer::Constants::GCC_TOOLCHAIN_TYPEID

src/plugins/cpptools/compileroptionsbuilder.h

@@ -34,6 +34,11 @@ namespace CppTools {
 class CPPTOOLS_EXPORT CompilerOptionsBuilder
 {
 public:
+    enum class PchUsage {
+        None,
+        Use
+    };
+
     CompilerOptionsBuilder(const ProjectPart &projectPart);
     virtual ~CompilerOptionsBuilder() {}
 
@@ -48,6 +53,7 @@ public:
     virtual void addTargetTriple();
     virtual void enableExceptions();
     void addHeaderPathOptions();
+    void addPrecompiledHeaderOptions(PchUsage pchUsage);
     void addToolchainAndProjectDefines();
     void addDefines(const QByteArray &defineDirectives);
     virtual void addLanguageOption(ProjectFile::Kind fileKind);
@@ -67,6 +73,7 @@ protected:
     virtual QString defineOption() const;
     virtual QString undefineOption() const;
     virtual QString includeOption() const;
+    virtual QString includeDirOption() const;
 
     const ProjectPart m_projectPart;
 

src/plugins/cpptools/cpptoolsreuse.cpp

@@ -288,4 +288,12 @@ bool fileSizeExceedsLimit(const QFileInfo &fileInfo, int sizeLimitInMb)
     return false;
 }
 
+CompilerOptionsBuilder::PchUsage getPchUsage()
+{
+    const QSharedPointer<CppCodeModelSettings> cms = codeModelSettings();
+    if (cms->pchUsage() == CppCodeModelSettings::PchUse_None)
+        return CompilerOptionsBuilder::PchUsage::None;
+    return CompilerOptionsBuilder::PchUsage::Use;
+}
+
 } // CppTools

src/plugins/cpptools/cpptoolsreuse.h

@@ -29,6 +29,8 @@
 
 #include <texteditor/texteditor.h>
 
+#include <cpptools/compileroptionsbuilder.h>
+
 #include <cplusplus/CppDocument.h>
 
 QT_BEGIN_NAMESPACE
@@ -72,6 +74,8 @@ void CPPTOOLS_EXPORT switchHeaderSource();
 class CppCodeModelSettings;
 QSharedPointer<CppCodeModelSettings> CPPTOOLS_EXPORT codeModelSettings();
 
+CompilerOptionsBuilder::PchUsage CPPTOOLS_EXPORT getPchUsage();
+
 int indexerFileSizeLimitInMb();
 bool fileSizeExceedsLimit(const QFileInfo &fileInfo, int sizeLimitInMb);