diff options
| author | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-10-30 10:31:34 +0100 |
|---|---|---|
| committer | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-11-01 14:52:05 +0000 |
| commit | f604c8a77cf86663fc751bcf23c94697088cfda1 (patch) | |
| tree | c98bc2ff2e694f3d93650260f8144e1e8c522f2f /src/plugins/cpptools/compileroptionsbuilder.cpp | |
| parent | cb75aa3e58987ed3cd8ac5e1dde089b855f731b2 (diff) | |
| download | qt-creator-f604c8a77cf86663fc751bcf23c94697088cfda1.tar.gz | |
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>
Diffstat (limited to 'src/plugins/cpptools/compileroptionsbuilder.cpp')
| -rw-r--r-- | src/plugins/cpptools/compileroptionsbuilder.cpp | 7 |
1 files changed, 0 insertions, 7 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(); |