diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-02-11 09:14:22 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-02-11 09:14:22 +0100 |
| commit | b03a981a411a7b93b5280d4e42faa8357854e638 (patch) | |
| tree | f91fb763dde57b15634673c4d58bd32f8999a886 /src/plugins/ios/iosrunconfiguration.h | |
| parent | 1f0665a3e2f0f33b43a492afac54d7300d65378f (diff) | |
| parent | cdc2a0f72334268684e0407e9b04b3188e00d4bf (diff) | |
| download | qt-creator-b03a981a411a7b93b5280d4e42faa8357854e638.tar.gz | |
Merge remote-tracking branch 'origin/3.0'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/shared/qbs
Change-Id: Ic6f115e3d9da32327cfe2d02d7356687dc3f60d7
Diffstat (limited to 'src/plugins/ios/iosrunconfiguration.h')
| -rw-r--r-- | src/plugins/ios/iosrunconfiguration.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/ios/iosrunconfiguration.h b/src/plugins/ios/iosrunconfiguration.h index 0acf6f8ec1..0c394361fd 100644 --- a/src/plugins/ios/iosrunconfiguration.h +++ b/src/plugins/ios/iosrunconfiguration.h @@ -61,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(); |