From 911cdc9188ce69b0db5685f13ab0843c93d1eca5 Mon Sep 17 00:00:00 2001 From: Fawzi Mohamed Date: Thu, 16 Jan 2014 18:35:36 +0100 Subject: ios: fix iosrunconfiguration m_arguments persistency Change-Id: I11b719725ed788cbdd97b0e64d69880949634905 Reviewed-by: Daniel Teske Reviewed-by: Eike Ziller Reviewed-by: Tobias Hunger --- src/plugins/ios/iosrunconfiguration.cpp | 16 ++++++++++++++++ src/plugins/ios/iosrunconfiguration.h | 4 ++++ 2 files changed, 20 insertions(+) diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp index b4994f4e26a..f607d311c98 100644 --- a/src/plugins/ios/iosrunconfiguration.cpp +++ b/src/plugins/ios/iosrunconfiguration.cpp @@ -54,6 +54,8 @@ using namespace QmakeProjectManager; namespace Ios { namespace Internal { +const QLatin1String runConfigurationKey("Ios.run_arguments"); + class IosRunConfigurationWidget : public RunConfigWidget { Q_OBJECT @@ -84,6 +86,7 @@ IosRunConfiguration::IosRunConfiguration(Target *parent, Core::Id id, const QStr IosRunConfiguration::IosRunConfiguration(Target *parent, IosRunConfiguration *source) : RunConfiguration(parent, source) , m_profilePath(source->m_profilePath) + , m_arguments(source->m_arguments) { init(); } @@ -194,6 +197,19 @@ Utils::FileName IosRunConfiguration::exePath() const return bundleDir().appendPath(appName()); } +bool IosRunConfiguration::fromMap(const QVariantMap &map) +{ + m_arguments = map.value(runConfigurationKey).toStringList(); + return RunConfiguration::fromMap(map); +} + +QVariantMap IosRunConfiguration::toMap() const +{ + QVariantMap res = RunConfiguration::toMap(); + res[runConfigurationKey] = m_arguments; + return res; +} + IosRunConfigurationWidget::IosRunConfigurationWidget(IosRunConfiguration *runConfiguration) : m_ui(new Ui::IosRunConfiguration), m_runConfiguration(runConfiguration) { diff --git a/src/plugins/ios/iosrunconfiguration.h b/src/plugins/ios/iosrunconfiguration.h index 6ae4dbb2895..3b2eb5e0ba5 100644 --- a/src/plugins/ios/iosrunconfiguration.h +++ b/src/plugins/ios/iosrunconfiguration.h @@ -34,6 +34,7 @@ #include #include +#include namespace Ios { namespace Internal { @@ -60,6 +61,9 @@ public: Utils::FileName bundleDir() const; Utils::FileName exePath() const; + bool fromMap(const QVariantMap &map) QTC_OVERRIDE; + QVariantMap toMap() const QTC_OVERRIDE; + protected: IosRunConfiguration(ProjectExplorer::Target *parent, IosRunConfiguration *source); QString defaultDisplayName(); -- cgit v1.2.3