diff options
author | hjk <hjk@qt.io> | 2018-03-19 13:39:11 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2018-03-27 12:31:45 +0000 |
commit | 116f7db28c7ae510fd91e9e9ad737448c66cbc60 (patch) | |
tree | 9896ad456daeae776c1ea79c83bd30adef1b8941 | |
parent | 40730a4eb21a098b1f8084464fff05bc3f8f9bf1 (diff) | |
download | qt-creator-116f7db28c7ae510fd91e9e9ad737448c66cbc60.tar.gz |
iOS: Use base method to list run configurations
The base method is good enough nowadays.
Change-Id: I1affc678a2168d002ed8f627a56f172e30c1c0be
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
-rw-r--r-- | src/plugins/ios/iosrunconfiguration.cpp | 5 | ||||
-rw-r--r-- | src/plugins/ios/iosrunconfiguration.h | 1 | ||||
-rw-r--r-- | src/plugins/ios/iosrunfactories.cpp | 18 | ||||
-rw-r--r-- | src/plugins/ios/iosrunfactories.h | 5 |
4 files changed, 6 insertions, 23 deletions
diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp index 09a3feebde..ed62de936f 100644 --- a/src/plugins/ios/iosrunconfiguration.cpp +++ b/src/plugins/ios/iosrunconfiguration.cpp @@ -263,6 +263,11 @@ bool IosRunConfiguration::fromMap(const QVariantMap &map) return true; } +void IosRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &info) +{ + m_profilePath = Utils::FileName::fromString(info.buildKey); +} + QVariantMap IosRunConfiguration::toMap() const { QVariantMap res = RunConfiguration::toMap(); diff --git a/src/plugins/ios/iosrunconfiguration.h b/src/plugins/ios/iosrunconfiguration.h index 4bdf92f046..6953db134e 100644 --- a/src/plugins/ios/iosrunconfiguration.h +++ b/src/plugins/ios/iosrunconfiguration.h @@ -69,6 +69,7 @@ signals: private: QString extraId() const final; + void doAdditionalSetup(const ProjectExplorer::RunConfigurationCreationInfo &info) final; void deviceChanges(); friend class IosRunConfigurationWidget; diff --git a/src/plugins/ios/iosrunfactories.cpp b/src/plugins/ios/iosrunfactories.cpp index 2faa99afba..b2485ab767 100644 --- a/src/plugins/ios/iosrunfactories.cpp +++ b/src/plugins/ios/iosrunfactories.cpp @@ -28,17 +28,8 @@ #include "iosconstants.h" #include "iosrunconfiguration.h" -#include <projectexplorer/project.h> -#include <projectexplorer/projectexplorerconstants.h> -#include <projectexplorer/target.h> - -#include <qmakeprojectmanager/qmakenodes.h> -#include <qmakeprojectmanager/qmakeproject.h> #include <qmakeprojectmanager/qmakeprojectmanagerconstants.h> -using namespace ProjectExplorer; -using namespace QmakeProjectManager; - namespace Ios { namespace Internal { @@ -50,14 +41,5 @@ IosRunConfigurationFactory::IosRunConfigurationFactory() addSupportedProjectType(QmakeProjectManager::Constants::QMAKEPROJECT_ID); } -QList<RunConfigurationCreationInfo> -IosRunConfigurationFactory::availableCreators(Target *parent) const -{ - auto project = qobject_cast<QmakeProject *>(parent->project()); - QTC_ASSERT(project, return {}); - return project->runConfigurationCreators(this, {ProjectType::ApplicationTemplate, - ProjectType::SharedLibraryTemplate}); -} - } // namespace Internal } // namespace Ios diff --git a/src/plugins/ios/iosrunfactories.h b/src/plugins/ios/iosrunfactories.h index 0f2b53b02b..9510e7a953 100644 --- a/src/plugins/ios/iosrunfactories.h +++ b/src/plugins/ios/iosrunfactories.h @@ -32,13 +32,8 @@ namespace Internal { class IosRunConfigurationFactory : public ProjectExplorer::RunConfigurationFactory { - Q_OBJECT - public: IosRunConfigurationFactory(); - - QList<ProjectExplorer::RunConfigurationCreationInfo> - availableCreators(ProjectExplorer::Target *parent) const override; }; } // namespace Internal |