ProjectExplorer: Remove RunConfiguration::activeBuildConfiguration

Only used once, and the concept is undesirable.

Change-Id: I7f28f8a20d6d1f003a6d8b18bbcfba343614625c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-02-26 13:20:25 +01:00
parent 5b87681366
commit 8cd145b32f
3 changed files with 3 additions and 9 deletions

View File

@@ -58,8 +58,8 @@ public:
setDisplayName(tr("Current Build Target")); setDisplayName(tr("Current Build Target"));
setDefaultDisplayName(tr("Current Build Target")); setDefaultDisplayName(tr("Current Build Target"));
setUpdater([this] { setUpdater([this, target] {
auto buildConfiguration = qobject_cast<NimBuildConfiguration *>(activeBuildConfiguration()); auto buildConfiguration = qobject_cast<NimBuildConfiguration *>(target->activeBuildConfiguration());
QTC_ASSERT(buildConfiguration, return); QTC_ASSERT(buildConfiguration, return);
const QFileInfo outFileInfo = buildConfiguration->outFilePath().toFileInfo(); const QFileInfo outFileInfo = buildConfiguration->outFilePath().toFileInfo();
aspect<ExecutableAspect>()->setExecutable(FilePath::fromString(outFileInfo.absoluteFilePath())); aspect<ExecutableAspect>()->setExecutable(FilePath::fromString(outFileInfo.absoluteFilePath()));

View File

@@ -248,11 +248,6 @@ QMap<Core::Id, QVariantMap> RunConfiguration::aspectData() const
return data; return data;
} }
BuildConfiguration *RunConfiguration::activeBuildConfiguration() const
{
return target()->activeBuildConfiguration();
}
BuildSystem *RunConfiguration::activeBuildSystem() const BuildSystem *RunConfiguration::activeBuildSystem() const
{ {
return target()->buildSystem(); return target()->buildSystem();

View File

@@ -174,8 +174,7 @@ signals:
protected: protected:
RunConfiguration(Target *target, Core::Id id); RunConfiguration(Target *target, Core::Id id);
/// convenience function to get current build configuration. /// convenience function to get current build system. Try to avoid.
BuildConfiguration *activeBuildConfiguration() const;
BuildSystem *activeBuildSystem() const; BuildSystem *activeBuildSystem() const;
using Updater = std::function<void()>; using Updater = std::function<void()>;