feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

iOS: Dissolve IosRunControlFactory

Browse Source 
Follows suite.

Change-Id: I2ef11d19d9a2d3d0f3f282a94f98a40478273fbc
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
hjk
2017-07-14 10:12:37 +02:00
parent cb0a09b74b
commit 6c04099601
4 changed files with 37 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/plugins/ios/iosrunfactories.cpp
View File

@@ -27,7 +27,6 @@
#include "iosconstants.h"
#include "iosrunconfiguration.h"
#include "iosrunner.h"
#include "iosmanager.h"
#include <debugger/analyzer/analyzermanager.h>
@@ -143,53 +142,5 @@ RunConfiguration *IosRunConfigurationFactory::doRestore(Target *parent, const QV
return new IosRunConfiguration(parent, id, pathFromId(id));
}
IosRunControlFactory::IosRunControlFactory(QObject *parent)
: IRunControlFactory(parent)
{
}
bool IosRunControlFactory::canRun(RunConfiguration *runConfiguration,
Core::Id mode) const
{
if (mode != ProjectExplorer::Constants::NORMAL_RUN_MODE
&& mode != ProjectExplorer::Constants::DEBUG_RUN_MODE
&& mode != ProjectExplorer::Constants::QML_PROFILER_RUN_MODE) {
return false;
}
return qobject_cast<IosRunConfiguration *>(runConfiguration);
}
RunControl *IosRunControlFactory::create(RunConfiguration *runConfig,
Core::Id mode, QString *errorMessage)
{
Q_UNUSED(errorMessage);
Q_ASSERT(canRun(runConfig, mode));
IosRunConfiguration *rc = qobject_cast<IosRunConfiguration *>(runConfig);
Q_ASSERT(rc);
Target *target = runConfig->target();
QTC_ASSERT(target, return 0);
Core::Id devId = DeviceKitInformation::deviceId(rc->target()->kit());
// The device can only run an application at a time, if an app is running stop it.
if (m_activeRunControls.contains(devId)) {
if (QPointer<RunControl> activeRunControl = m_activeRunControls[devId])
activeRunControl->initiateStop();
m_activeRunControls.remove(devId);
}
auto runControl = new RunControl(runConfig, mode);
if (mode == ProjectExplorer::Constants::NORMAL_RUN_MODE) {
(void) new Ios::Internal::IosRunSupport(runControl);
} else if (mode == ProjectExplorer::Constants::QML_PROFILER_RUN_MODE) {
(void) new IosQmlProfilerSupport(runControl);
} else {
(void) new IosDebugSupport(runControl);
}
if (devId.isValid())
m_activeRunControls[devId] = runControl;
return runControl;
}
} // namespace Internal
} // namespace Ios