From 45d42d45188e504a4ba23d697d944874d3729fd4 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 3 Mar 2020 13:35:52 +0100 Subject: [PATCH] CompilationDbManager: Do not create an extra target The hidden extra target creates all kinds of inconsistencies, e.g. between mini project target selector and target model. Besides, there is no reason why this project manager should behave differently from the others in this respect. Fixes: QTCREATORBUG-23518 Change-Id: I11022f63bed33191f6349681356b4dd9537de50c Reviewed-by: hjk --- .../compilationdatabaseproject.cpp | 7 ------- .../compilationdatabaseproject.h | 7 ------- 2 files changed, 14 deletions(-) diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp index 1f60fd0fe36..c373e5d58a6 100644 --- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp +++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp @@ -38,12 +38,10 @@ #include #include #include -#include #include #include #include #include -#include #include #include @@ -439,12 +437,7 @@ CompilationDatabaseProject::CompilationDatabaseProject(const Utils::FilePath &pr setId(Constants::COMPILATIONDATABASEPROJECT_ID); setProjectLanguages(Core::Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID)); setDisplayName(projectDirectory().fileName()); - setBuildSystemCreator([](Target *t) { return new CompilationDatabaseBuildSystem(t); }); - - m_kit.reset(KitManager::defaultKit()->clone()); - addTargetForKit(m_kit.get()); - setExtraProjectFiles( {projectFile.stringAppended(Constants::COMPILATIONDATABASEPROJECT_FILES_SUFFIX)}); } diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.h b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.h index 40ed930366d..14adde037cb 100644 --- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.h +++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.h @@ -55,14 +55,7 @@ class CompilationDatabaseProject : public ProjectExplorer::Project public: explicit CompilationDatabaseProject(const Utils::FilePath &filename); - - bool needsConfiguration() const override { return false; } - Utils::FilePath rootPathFromSettings() const; - ProjectExplorer::Kit *kit() const { return m_kit.get(); } - -private: - std::unique_ptr m_kit; }; class CompilationDatabaseBuildSystem : public ProjectExplorer::BuildSystem