summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFawzi Mohamed <fawzi.mohamed@digia.com>2014-01-16 18:35:36 +0100
committerFawzi Mohamed <fawzi.mohamed@digia.com>2014-01-22 10:42:54 +0100
commit911cdc9188ce69b0db5685f13ab0843c93d1eca5 (patch)
tree3047d50acb8ee4890d4e870d6240c9da101424af
parent52bff97cfa3b91d88a48f76ca7cd0584407594d4 (diff)
downloadqt-creator-911cdc9188ce69b0db5685f13ab0843c93d1eca5.tar.gz
ios: fix iosrunconfiguration m_arguments persistency
Change-Id: I11b719725ed788cbdd97b0e64d69880949634905 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
-rw-r--r--src/plugins/ios/iosrunconfiguration.cpp16
-rw-r--r--src/plugins/ios/iosrunconfiguration.h4
2 files changed, 20 insertions, 0 deletions
diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp
index b4994f4e26..f607d311c9 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 6ae4dbb289..3b2eb5e0ba 100644
--- a/src/plugins/ios/iosrunconfiguration.h
+++ b/src/plugins/ios/iosrunconfiguration.h
@@ -34,6 +34,7 @@
#include <projectexplorer/runconfiguration.h>
#include <utils/fileutils.h>
+#include <utils/qtcoverride.h>
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();