From 44674117a58aabb98c8468641615362294ac79cb Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 9 Jan 2019 13:49:21 +0100 Subject: [PATCH] QmakeProject: Remove DesktopQmakeRunConfiguration::fromMap Base functionality is sufficient: The only difference is triggering updateTargetInformation() and that is triggered (later...) in response to Project::parsingFinished() too. The different timing is uncritical as the run configuration is not accessible in the run settings combo box during that time. Also, no other runconfigurations use that extra call. Change-Id: I1c3379ad35baf70d4a45d1a1a2340927eda93785 Reviewed-by: Christian Kandeler --- .../desktopqmakerunconfiguration.cpp | 10 ---------- .../qmakeprojectmanager/desktopqmakerunconfiguration.h | 2 -- 2 files changed, 12 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp index 70c601f73ed..385fd54b3d0 100644 --- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp @@ -105,16 +105,6 @@ void DesktopQmakeRunConfiguration::updateTargetInformation() aspect()->setExecutable(bti.targetFilePath); } -bool DesktopQmakeRunConfiguration::fromMap(const QVariantMap &map) -{ - const bool res = RunConfiguration::fromMap(map); - if (!res) - return false; - - updateTargetInformation(); - return true; -} - void DesktopQmakeRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &) { updateTargetInformation(); diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h index 8d7a2ea0de8..ecaa1bfc6b8 100644 --- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h +++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h @@ -42,8 +42,6 @@ public: void addToBaseEnvironment(Utils::Environment &env) const; private: - bool fromMap(const QVariantMap &map) override; - void updateTargetInformation(); void doAdditionalSetup(const ProjectExplorer::RunConfigurationCreationInfo &info) final;