CompilationDatabase: Support both code models

Extract headers, defines and fileKind from flags in
order to have complete project parts.

Side-effect: better support for MSVC-specific flags.
Change-Id: Iaa1413c91c96c3cf89ddbe76a7a1f0f46c5289c0
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>

2 files changed, 0 insertions, 10 deletions

diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp
index 3c88cce384..4857e20c2e 100644
--- a/src/plugins/cpptools/compileroptionsbuilder.cpp
+++ b/src/plugins/cpptools/compileroptionsbuilder.cpp
@@ -76,13 +76,6 @@ QStringList CompilerOptionsBuilder::build(CppTools::ProjectFile::Kind fileKind,
     addTargetTriple();
     addExtraCodeModelFlags();
 
-    if (m_projectPart.toolchainType
-            == ProjectExplorer::Constants::COMPILATION_DATABASE_TOOLCHAIN_TYPEID) {
-        addHeaderPathOptions();
-        insertWrappedQtHeaders();
-        return options();
-    }
-
     updateLanguageOption(fileKind);
     addOptionsForLanguage(/*checkForBorlandExtensions*/ true);
     enableExceptions();
diff --git a/src/plugins/cpptools/cppprojectinfogenerator.cpp b/src/plugins/cpptools/cppprojectinfogenerator.cpp
index 0eb1af9c6e..9fae0db017 100644
--- a/src/plugins/cpptools/cppprojectinfogenerator.cpp
+++ b/src/plugins/cpptools/cppprojectinfogenerator.cpp
@@ -165,9 +165,6 @@ ProjectPart::Ptr ProjectInfoGenerator::createProjectPart(
     part->warningFlags = flags.warningFlags;
     part->languageExtensions = flags.languageExtensions;
 
-    if (part->toolchainType == ProjectExplorer::Constants::COMPILATION_DATABASE_TOOLCHAIN_TYPEID)
-        part->extraCodeModelFlags = flags.commandLineFlags;
-
     // Toolchain macros and language version
     if (tcInfo.macroInspectionRunner) {
         auto macroInspectionReport = tcInfo.macroInspectionRunner(flags.commandLineFlags);