diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp index ad668661ab3..d930c380d78 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp @@ -56,8 +56,8 @@ using namespace ProjectExplorer::Constants; // AutotoolsBuildConfiguration -AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(Target *parent) - : BuildConfiguration(parent, Constants::AUTOTOOLS_BC_ID) +AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(Target *parent, Core::Id id) + : BuildConfiguration(parent, id) { // / is used so the un-changed check in setBuildDirectory() works correctly. // The leading / is to avoid the relative the path expansion in BuildConfiguration::buildDirectory. @@ -111,7 +111,9 @@ NamedWidget *AutotoolsBuildConfiguration::createConfigWidget() AutotoolsBuildConfigurationFactory::AutotoolsBuildConfigurationFactory() { - registerBuildConfiguration(AUTOTOOLS_BC_ID); + registerBuildConfiguration + ("AutotoolsProjectManager.AutotoolsBuildConfiguration"); + setSupportedProjectType(Constants::AUTOTOOLS_PROJECT_ID); setSupportedProjectMimeTypeName(Constants::MAKEFILE_MIMETYPE); } diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h index f2bafd36244..c8cafe540d7 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h +++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h @@ -39,7 +39,7 @@ class AutotoolsBuildConfiguration : public ProjectExplorer::BuildConfiguration Q_OBJECT friend class ProjectExplorer::IBuildConfigurationFactory; - explicit AutotoolsBuildConfiguration(ProjectExplorer::Target *parent); + AutotoolsBuildConfiguration(ProjectExplorer::Target *parent, Core::Id id); void initialize(const ProjectExplorer::BuildInfo *info) override; ProjectExplorer::NamedWidget *createConfigWidget() override; diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectconstants.h b/src/plugins/autotoolsprojectmanager/autotoolsprojectconstants.h index df084d6b48e..74cf14a1034 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectconstants.h +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectconstants.h @@ -34,9 +34,6 @@ namespace AutotoolsProjectManager { namespace Constants { const char MAKEFILE_MIMETYPE[] = "text/x-makefile"; -//BuildConfiguration - const char AUTOTOOLS_BC_ID[] = "AutotoolsProjectManager.AutotoolsBuildConfiguration"; - //Project const char AUTOTOOLS_PROJECT_ID[] = "AutotoolsProjectManager.AutotoolsProject"; } // namespace Constants diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index 39ddb536a39..1aeed274a19 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -60,8 +60,8 @@ namespace Internal { const char INITIAL_ARGUMENTS[] = "CMakeProjectManager.CMakeBuildConfiguration.InitialArgument"; // Obsolete since QtC 3.7 const char CONFIGURATION_KEY[] = "CMake.Configuration"; -CMakeBuildConfiguration::CMakeBuildConfiguration(Target *parent) - : BuildConfiguration(parent, Constants::CMAKE_BC_ID) +CMakeBuildConfiguration::CMakeBuildConfiguration(Target *parent, Core::Id id) + : BuildConfiguration(parent, id) { CMakeProject *project = static_cast(target()->project()); setBuildDirectory(shadowBuildDirectory(project->projectFilePath(), @@ -334,7 +334,8 @@ ProjectExplorer::NamedWidget *CMakeBuildConfiguration::createConfigWidget() CMakeBuildConfigurationFactory::CMakeBuildConfigurationFactory() { - registerBuildConfiguration(Constants::CMAKE_BC_ID); + registerBuildConfiguration("CMakeProjectManager.CMakeBuildConfiguration"); + setSupportedProjectType(CMakeProjectManager::Constants::CMAKEPROJECT_ID); setSupportedProjectMimeTypeName(Constants::CMAKEPROJECTMIMETYPE); } diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h index 5a381d0f472..a763fbc1c5a 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h @@ -47,7 +47,7 @@ class CMakeBuildConfiguration : public ProjectExplorer::BuildConfiguration Q_OBJECT friend class ProjectExplorer::IBuildConfigurationFactory; - explicit CMakeBuildConfiguration(ProjectExplorer::Target *parent); + CMakeBuildConfiguration(ProjectExplorer::Target *parent, Core::Id id); public: void emitBuildTypeChanged(); diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h b/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h index bd9be308c36..e1e1a0114ed 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h @@ -42,9 +42,6 @@ const char RUNCMAKECONTEXTMENU[] = "CMakeProject.RunCMakeContextMenu"; // Project const char CMAKEPROJECT_ID[] = "CMakeProjectManager.CMakeProject"; -// Buildconfiguration -const char CMAKE_BC_ID[] = "CMakeProjectManager.CMakeBuildConfiguration"; - // Menu const char M_CONTEXT[] = "CMakeEditor.ContextMenu"; diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp index 4080fcf7f21..ef4f03b5c1f 100644 --- a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp +++ b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp @@ -52,10 +52,8 @@ using namespace ProjectExplorer; namespace GenericProjectManager { namespace Internal { -const char GENERIC_BC_ID[] = "GenericProjectManager.GenericBuildConfiguration"; - -GenericBuildConfiguration::GenericBuildConfiguration(Target *parent) - : BuildConfiguration(parent, GENERIC_BC_ID) +GenericBuildConfiguration::GenericBuildConfiguration(Target *parent, Core::Id id) + : BuildConfiguration(parent, id) { updateCacheAndEmitEnvironmentChanged(); } @@ -84,7 +82,9 @@ NamedWidget *GenericBuildConfiguration::createConfigWidget() GenericBuildConfigurationFactory::GenericBuildConfigurationFactory() { - registerBuildConfiguration(GENERIC_BC_ID); + registerBuildConfiguration + ("GenericProjectManager.GenericBuildConfiguration"); + setSupportedProjectType(Constants::GENERICPROJECT_ID); setSupportedProjectMimeTypeName(Constants::GENERICMIMETYPE); } diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.h b/src/plugins/genericprojectmanager/genericbuildconfiguration.h index dc2121c16d4..bb3781e51cf 100644 --- a/src/plugins/genericprojectmanager/genericbuildconfiguration.h +++ b/src/plugins/genericprojectmanager/genericbuildconfiguration.h @@ -41,7 +41,7 @@ class GenericBuildConfiguration : public ProjectExplorer::BuildConfiguration Q_OBJECT friend class ProjectExplorer::IBuildConfigurationFactory; - explicit GenericBuildConfiguration(ProjectExplorer::Target *parent); + GenericBuildConfiguration(ProjectExplorer::Target *parent, Core::Id id); void initialize(const ProjectExplorer::BuildInfo *info) override; ProjectExplorer::NamedWidget *createConfigWidget() override; diff --git a/src/plugins/ios/iosbuildconfiguration.cpp b/src/plugins/ios/iosbuildconfiguration.cpp index 1d5bf59ee3a..e45e749ee08 100644 --- a/src/plugins/ios/iosbuildconfiguration.cpp +++ b/src/plugins/ios/iosbuildconfiguration.cpp @@ -49,8 +49,8 @@ const char qmakeProvisioningProfileSettings[] = "QMAKE_MAC_XCODE_SETTINGS+=qprof const char signingIdentifierKey[] = "Ios.SigningIdentifier"; const char autoManagedSigningKey[] = "Ios.AutoManagedSigning"; -IosBuildConfiguration::IosBuildConfiguration(Target *target) - : QmakeBuildConfiguration(target) +IosBuildConfiguration::IosBuildConfiguration(Target *target, Core::Id id) + : QmakeBuildConfiguration(target, id) { } diff --git a/src/plugins/ios/iosbuildconfiguration.h b/src/plugins/ios/iosbuildconfiguration.h index 60f8d0d0d8f..aa3b529e943 100644 --- a/src/plugins/ios/iosbuildconfiguration.h +++ b/src/plugins/ios/iosbuildconfiguration.h @@ -34,7 +34,7 @@ class IosBuildConfiguration : public QmakeProjectManager::QmakeBuildConfiguratio Q_OBJECT public: - explicit IosBuildConfiguration(ProjectExplorer::Target *target); + IosBuildConfiguration(ProjectExplorer::Target *target, Core::Id id); private: QList createSubConfigWidgets() override; diff --git a/src/plugins/nim/project/nimbuildconfiguration.cpp b/src/plugins/nim/project/nimbuildconfiguration.cpp index 7be50ea787e..135d44f5a73 100644 --- a/src/plugins/nim/project/nimbuildconfiguration.cpp +++ b/src/plugins/nim/project/nimbuildconfiguration.cpp @@ -70,8 +70,8 @@ static FileName defaultBuildDirectory(const Kit *k, return result; } -NimBuildConfiguration::NimBuildConfiguration(Target *target) - : BuildConfiguration(target, Constants::C_NIMBUILDCONFIGURATION_ID) +NimBuildConfiguration::NimBuildConfiguration(Target *target, Core::Id id) + : BuildConfiguration(target, id) { } diff --git a/src/plugins/nim/project/nimbuildconfiguration.h b/src/plugins/nim/project/nimbuildconfiguration.h index de2b5a94647..60508220bd6 100644 --- a/src/plugins/nim/project/nimbuildconfiguration.h +++ b/src/plugins/nim/project/nimbuildconfiguration.h @@ -37,7 +37,7 @@ class NimBuildConfiguration : public ProjectExplorer::BuildConfiguration Q_OBJECT friend class ProjectExplorer::IBuildConfigurationFactory; - explicit NimBuildConfiguration(ProjectExplorer::Target *target); + NimBuildConfiguration(ProjectExplorer::Target *target, Core::Id id); void initialize(const ProjectExplorer::BuildInfo *info) override; ProjectExplorer::NamedWidget *createConfigWidget() override; diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h index b720e204edb..7535409a67a 100644 --- a/src/plugins/projectexplorer/buildconfiguration.h +++ b/src/plugins/projectexplorer/buildconfiguration.h @@ -159,7 +159,7 @@ protected: void registerBuildConfiguration(Core::Id buildConfigId) { setObjectName(buildConfigId.toString() + "BuildConfigurationFactory"); - m_creator = [](Target *t) { return new BuildConfig(t); }; + m_creator = [buildConfigId](Target *t) { return new BuildConfig(t, buildConfigId); }; m_buildConfigId = buildConfigId; } diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp index 05c4d8cf842..ce2b764d3b8 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp @@ -74,8 +74,8 @@ static FileName defaultBuildDirectory(const QString &projectFilePath, const Kit // QbsBuildConfiguration: // --------------------------------------------------------------------------- -QbsBuildConfiguration::QbsBuildConfiguration(Target *target) - : BuildConfiguration(target, Constants::QBS_BC_ID) +QbsBuildConfiguration::QbsBuildConfiguration(Target *target, Core::Id id) + : BuildConfiguration(target, id) { connect(project(), &Project::parsingStarted, this, &BuildConfiguration::enabledChanged); connect(project(), &Project::parsingFinished, this, &BuildConfiguration::enabledChanged); diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h index 3c3fbdf30b3..f27895066f7 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h +++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h @@ -46,7 +46,7 @@ class QbsBuildConfiguration : public ProjectExplorer::BuildConfiguration Q_OBJECT friend class ProjectExplorer::IBuildConfigurationFactory; - explicit QbsBuildConfiguration(ProjectExplorer::Target *target); + QbsBuildConfiguration(ProjectExplorer::Target *target, Core::Id id); public: void initialize(const ProjectExplorer::BuildInfo *info) override; diff --git a/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp b/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp index 3ffa785d60f..1100a7e7e46 100644 --- a/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp +++ b/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp @@ -59,8 +59,8 @@ AndroidQmakeBuildConfigurationFactory::AndroidQmakeBuildConfigurationFactory() // AndroidQmakeBuildConfiguration -AndroidQmakeBuildConfiguration::AndroidQmakeBuildConfiguration(Target *target) - : QmakeBuildConfiguration(target) +AndroidQmakeBuildConfiguration::AndroidQmakeBuildConfiguration(Target *target, Core::Id id) + : QmakeBuildConfiguration(target, id) { updateCacheAndEmitEnvironmentChanged(); connect(target->project(), &Project::parsingFinished, this, [this] { diff --git a/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.h b/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.h index 3813eaa596a..71d727adb9e 100644 --- a/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.h +++ b/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.h @@ -41,7 +41,7 @@ class AndroidQmakeBuildConfiguration : public QmakeProjectManager::QmakeBuildCon Q_OBJECT public: - explicit AndroidQmakeBuildConfiguration(ProjectExplorer::Target *target); + AndroidQmakeBuildConfiguration(ProjectExplorer::Target *target, Core::Id id); void initialize(const ProjectExplorer::BuildInfo *info) override; void addToEnvironment(Utils::Environment &env) const override; diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp index 58ca2040c29..b079ef27dcf 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp @@ -98,8 +98,8 @@ const char BUILD_CONFIGURATION_KEY[] = "Qt4ProjectManager.Qt4BuildConfiguration. enum { debug = 0 }; -QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target) - : BuildConfiguration(target, Constants::QMAKE_BC_ID) +QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, Core::Id id) + : BuildConfiguration(target, id) { connect(this, &BuildConfiguration::buildDirectoryChanged, this, &QmakeBuildConfiguration::emitProFileEvaluateNeeded); diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h index fc15878effa..25c6751a371 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h @@ -47,7 +47,7 @@ class QMAKEPROJECTMANAGER_EXPORT QmakeBuildConfiguration : public ProjectExplore Q_OBJECT public: - explicit QmakeBuildConfiguration(ProjectExplorer::Target *target); + QmakeBuildConfiguration(ProjectExplorer::Target *target, Core::Id id); ~QmakeBuildConfiguration() override; void initialize(const ProjectExplorer::BuildInfo *info) override;