aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/ios/iosrunconfiguration.cpp
diff options
context:
space:
mode:
authorhjk <[email protected]>2018-04-25 10:26:08 +0200
committerhjk <[email protected]>2018-04-25 15:06:11 +0000
commit366be94ad9edf4c7b15edd9e9af981b857631385 (patch)
tree0f77be5679d35eedf54480011a1394b01cf9ea8f /src/plugins/ios/iosrunconfiguration.cpp
parent4146a9859907c561864bfbd412d8b65ed69216ad (diff)
Pass id to RunConfiguration constructor
It's what the base class requires, and opens the possibility to have several factories creating the same type of run configuration. Also move ios, winrt and android factories closer to their products, it's the predominant pattern nowadays. Change-Id: Iad48152f02a248d22cb18dd435a2fc34d73c7077 Reviewed-by: Christian Kandeler <[email protected]>
Diffstat (limited to 'src/plugins/ios/iosrunconfiguration.cpp')
-rw-r--r--src/plugins/ios/iosrunconfiguration.cpp20
1 files changed, 17 insertions, 3 deletions
diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp
index 56075fbd953..307026cdc64 100644
--- a/src/plugins/ios/iosrunconfiguration.cpp
+++ b/src/plugins/ios/iosrunconfiguration.cpp
@@ -35,9 +35,12 @@
#include <projectexplorer/buildstep.h>
#include <projectexplorer/buildsteplist.h>
#include <projectexplorer/runconfigurationaspects.h>
+
#include <qmakeprojectmanager/qmakebuildconfiguration.h>
-#include <qmakeprojectmanager/qmakeproject.h>
#include <qmakeprojectmanager/qmakenodes.h>
+#include <qmakeprojectmanager/qmakeproject.h>
+#include <qmakeprojectmanager/qmakeprojectmanagerconstants.h>
+
#include <qtsupport/qtoutputformatter.h>
#include <qtsupport/qtkitinformation.h>
@@ -93,8 +96,8 @@ private:
QComboBox *m_deviceTypeComboBox;
};
-IosRunConfiguration::IosRunConfiguration(Target *target)
- : RunConfiguration(target, Constants::IOS_RC_ID_PREFIX)
+IosRunConfiguration::IosRunConfiguration(Target *target, Core::Id id)
+ : RunConfiguration(target, id)
{
addExtraAspect(new ArgumentsAspect(this, "Ios.run_arguments"));
setOutputFormatter<QtSupport::QtOutputFormatter>();
@@ -419,5 +422,16 @@ void IosRunConfigurationWidget::updateValues()
m_executableLineEdit->setText(m_runConfiguration->localExecutable().toUserOutput());
}
+
+// IosRunConfigurationFactory
+
+IosRunConfigurationFactory::IosRunConfigurationFactory()
+{
+ registerRunConfiguration<IosRunConfiguration>("Qt4ProjectManager.IosRunConfiguration:");
+ addSupportedTargetDeviceType(Constants::IOS_DEVICE_TYPE);
+ addSupportedTargetDeviceType(Constants::IOS_SIMULATOR_TYPE);
+ addSupportedProjectType(QmakeProjectManager::Constants::QMAKEPROJECT_ID);
+}
+
} // namespace Internal
} // namespace Ios