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

Ios: Adapt IosRunControlFactory to Analyzer changes

Browse Source 
Change-Id: I6aed9afaffadc33bec63d798b3f1f7e525a7f790
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
This commit is contained in:
hjk
2016-01-19 16:02:12 +01:00
committed by Alessandro Portale
parent 5dad96e3b7
commit 82621c7b89
3 changed files with 23 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/ios/iosanalyzesupport.cpp
View File

@@ -42,7 +42,6 @@
#include <analyzerbase/ianalyzertool.h>
#include <analyzerbase/analyzermanager.h>
#include <analyzerbase/analyzerruncontrol.h>
#include <analyzerbase/analyzerstartparameters.h>
#include <utils/outputformat.h>
#include <utils/qtcprocess.h>
@@ -64,33 +63,6 @@ using namespace ProjectExplorer;
namespace Ios {
namespace Internal {
RunControl *IosAnalyzeSupport::createAnalyzeRunControl(IosRunConfiguration *runConfig,
QString *errorMessage)
{
Q_UNUSED(errorMessage);
Target *target = runConfig->target();
if (!target)
return 0;
IDevice::ConstPtr device = DeviceKitInformation::device(target->kit());
if (device.isNull())
return 0;
AnalyzerStartParameters params;
params.debuggee = runConfig->localExecutable().toUserOutput();
params.debuggeeArgs = runConfig->commandLineArguments();
params.analyzerHost = QLatin1String("localhost");
if (device->type() == Core::Id(Ios::Constants::IOS_DEVICE_TYPE)) {
IosDevice::ConstPtr iosDevice = device.dynamicCast<const IosDevice>();
if (iosDevice.isNull())
return 0;
}
AnalyzerRunControl *analyzerRunControl =
AnalyzerManager::createRunControl(params, runConfig, ProjectExplorer::Constants::QML_PROFILER_RUN_MODE);
if (analyzerRunControl)
analyzerRunControl->setDisplayName(runConfig->applicationName());
(void) new IosAnalyzeSupport(runConfig, analyzerRunControl, false, true);
return analyzerRunControl;
}
IosAnalyzeSupport::IosAnalyzeSupport(IosRunConfiguration *runConfig,
AnalyzerRunControl *runControl, bool cppDebug, bool qmlDebug)
: QObject(runControl), m_runControl(runControl),

3
src/plugins/ios/iosanalyzesupport.h
View File

@@ -46,9 +46,6 @@ class IosAnalyzeSupport : public QObject
Q_OBJECT
public:
static ProjectExplorer::RunControl *createAnalyzeRunControl(IosRunConfiguration *runConfig,
QString *errorMessage);
IosAnalyzeSupport(IosRunConfiguration *runConfig,
Analyzer::AnalyzerRunControl *runControl, bool cppDebug, bool qmlDebug);
~IosAnalyzeSupport();

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

@@ -32,6 +32,8 @@
#include "iosmanager.h"
#include "iosanalyzesupport.h"
#include <analyzerbase/analyzermanager.h>
#include <analyzerbase/analyzerruncontrol.h>
#include <projectexplorer/project.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projectexplorer.h>
@@ -44,6 +46,7 @@
#include <qtsupport/qtsupportconstants.h>
#include <coreplugin/id.h>
using namespace Analyzer;
using namespace ProjectExplorer;
using namespace QmakeProjectManager;
@@ -172,6 +175,8 @@ RunControl *IosRunControlFactory::create(RunConfiguration *runConfig,
Q_ASSERT(canRun(runConfig, mode));
IosRunConfiguration *rc = qobject_cast<IosRunConfiguration *>(runConfig);
Q_ASSERT(rc);
Target *target = runConfig->target();
QTC_ASSERT(target, return 0);
RunControl *res = 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.
@@ -182,8 +187,24 @@ RunControl *IosRunControlFactory::create(RunConfiguration *runConfig,
}
if (mode == ProjectExplorer::Constants::NORMAL_RUN_MODE)
res = new Ios::Internal::IosRunControl(rc);
else if (mode == ProjectExplorer::Constants::QML_PROFILER_RUN_MODE)
res = IosAnalyzeSupport::createAnalyzeRunControl(rc, errorMessage);
else if (mode == ProjectExplorer::Constants::QML_PROFILER_RUN_MODE) {
AnalyzerRunControl *runControl = AnalyzerManager::createRunControl(runConfig, mode);
QTC_ASSERT(runControl, return 0);
IDevice::ConstPtr device = DeviceKitInformation::device(target->kit());
if (device.isNull())
return 0;
auto iosRunConfig = qobject_cast<IosRunConfiguration *>(runConfig);
AnalyzerRunnable runnable;
runnable.debuggee = iosRunConfig->localExecutable().toUserOutput();
runnable.debuggeeArgs = iosRunConfig->commandLineArguments();
AnalyzerConnection connection;
connection.analyzerHost = QLatin1String("localhost");
runControl->setRunnable(runnable);
runControl->setConnection(connection);
runControl->setDisplayName(iosRunConfig->applicationName());
(void) new IosAnalyzeSupport(iosRunConfig, runControl, false, true);
return runControl;
}
else
res = IosDebugSupport::createDebugRunControl(rc, errorMessage);
if (devId.isValid())