From 4ec4f111cb3ce038a114769300647ee66875d658 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 24 Apr 2018 16:52:29 +0200 Subject: [PATCH] CMake: Do not store the "title" in the run configuration This has been superseded by other items, most notably the buildKey. Incidentally, even Creator 4.6 is robust enough to handle .user files without the CMakeProjectManager.CMakeRunConfiguation.Title key without problem. Change-Id: Iaecb2c15b31ebfb78146c0bec8b955ae821e4499 Reviewed-by: Tobias Hunger --- .../cmakerunconfiguration.cpp | 20 +------------------ .../cmakerunconfiguration.h | 4 ---- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp index b53f7cd07df..a5cb8c4d382 100644 --- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp @@ -40,8 +40,6 @@ using namespace ProjectExplorer; namespace CMakeProjectManager { namespace Internal { -const char TITLE_KEY[] = "CMakeProjectManager.CMakeRunConfiguation.Title"; - CMakeRunConfiguration::CMakeRunConfiguration(Target *target, Core::Id id) : RunConfiguration(target, id) { @@ -68,23 +66,9 @@ CMakeRunConfiguration::CMakeRunConfiguration(Target *target, Core::Id id) setOutputFormatter(); } -QVariantMap CMakeRunConfiguration::toMap() const -{ - QVariantMap map(RunConfiguration::toMap()); - map.insert(QLatin1String(TITLE_KEY), m_title); - return map; -} - -bool CMakeRunConfiguration::fromMap(const QVariantMap &map) -{ - RunConfiguration::fromMap(map); - m_title = map.value(QLatin1String(TITLE_KEY)).toString(); - return true; -} - void CMakeRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &info) { - m_title = info.displayName; + Q_UNUSED(info); updateTargetInformation(); } @@ -112,8 +96,6 @@ QString CMakeRunConfiguration::disabledReason() const void CMakeRunConfiguration::updateTargetInformation() { - setDefaultDisplayName(m_title); - BuildTargetInfo bti = target()->applicationTargets().buildTargetInfo(buildKey()); extraAspect()->setExecutable(bti.targetFilePath); extraAspect()->setDefaultWorkingDirectory(bti.workingDirectory); diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h index d6deaf20d7b..7d9fdcc7cf0 100644 --- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h +++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h @@ -38,17 +38,13 @@ public: CMakeRunConfiguration(ProjectExplorer::Target *target, Core::Id id); private: - QVariantMap toMap() const override; QString disabledReason() const override; - bool fromMap(const QVariantMap &map) override; void doAdditionalSetup(const ProjectExplorer::RunConfigurationCreationInfo &) override; bool isBuildTargetValid() const; void updateTargetInformation(); void updateEnabledState() final; - - QString m_title; }; class CMakeRunConfigurationFactory : public ProjectExplorer::RunConfigurationFactory