From 336a3c14c0f43668db0392e681f9cceddbc2df6d Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 9 Jan 2019 13:34:35 +0100 Subject: [PATCH] QmakeProject: Remove DesktopQmakeRunConfiguration::toMap Base functionality is sufficient nowadays, this was only kept for upgrading purposes. The data is never read back in post-4.7 Creator builds. Change-Id: I80c198ca2d17bc581d1576937a4d1ede3dc71fe0 Reviewed-by: Christian Kandeler --- .../desktopqmakerunconfiguration.cpp | 11 ----------- .../desktopqmakerunconfiguration.h | 2 -- 2 files changed, 13 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp index f25b77a65fc..70c601f73ed 100644 --- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp @@ -54,8 +54,6 @@ using namespace Utils; namespace QmakeProjectManager { namespace Internal { -const char PRO_FILE_KEY[] = "Qt4ProjectManager.Qt4RunConfiguration.ProFile"; - // // DesktopQmakeRunConfiguration // @@ -107,15 +105,6 @@ void DesktopQmakeRunConfiguration::updateTargetInformation() aspect()->setExecutable(bti.targetFilePath); } -QVariantMap DesktopQmakeRunConfiguration::toMap() const -{ - // FIXME: For compatibility purposes in the 4.7 dev cycle only. - const QDir projectDir = QDir(target()->project()->projectDirectory().toString()); - QVariantMap map(RunConfiguration::toMap()); - map.insert(QLatin1String(PRO_FILE_KEY), projectDir.relativeFilePath(proFilePath().toString())); - return map; -} - bool DesktopQmakeRunConfiguration::fromMap(const QVariantMap &map) { const bool res = RunConfiguration::fromMap(map); diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h index d5cb6a8d3a1..8d7a2ea0de8 100644 --- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h +++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h @@ -39,8 +39,6 @@ class DesktopQmakeRunConfiguration : public ProjectExplorer::RunConfiguration public: DesktopQmakeRunConfiguration(ProjectExplorer::Target *target, Core::Id id); - QVariantMap toMap() const override; - void addToBaseEnvironment(Utils::Environment &env) const; private: