From f604c8a77cf86663fc751bcf23c94697088cfda1 Mon Sep 17 00:00:00 2001
From: Ivan Donchevskii <ivan.donchevskii@qt.io>
Date: Tue, 30 Oct 2018 10:31:34 +0100
Subject: 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>
---
 src/plugins/cpptools/compileroptionsbuilder.cpp | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'src/plugins/cpptools/compileroptionsbuilder.cpp')

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();
-- 
cgit v1.2.1