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

QmlProfiler: Remove StartQmlRemote start mode

Browse Source 
Change-Id: I7a4ef54a02fcc8dedb28e843a2f05d737324a877
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Aurindam Jana
2013-08-02 16:53:48 +02:00
committed by hjk
parent 56bdb0d1ea
commit 904dd68e5f
6 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/analyzerbase/analyzerconstants.h
View File

@@ -43,8 +43,7 @@ namespace Analyzer {
enum StartMode enum StartMode
{ {
StartLocal = -1, StartLocal = -1,
StartRemote = -2, StartRemote = -2
StartQmlRemote = -4 // TODO: remove this enum and make it generic
}; };
namespace Constants { namespace Constants {

2
src/plugins/analyzerbase/analyzerstartparameters.h
View File

@@ -47,7 +47,7 @@ namespace Analyzer {
class ANALYZER_EXPORT AnalyzerStartParameters class ANALYZER_EXPORT AnalyzerStartParameters
{ {
public: public:
AnalyzerStartParameters() AnalyzerStartParameters() : analyzerPort(0)
{} {}
StartMode startMode; StartMode startMode;

2
src/plugins/android/androidanalyzesupport.cpp
View File

@@ -65,7 +65,7 @@ RunControl *AndroidAnalyzeSupport::createAnalyzeRunControl(AndroidRunConfigurati
QTC_ASSERT(server.listen(QHostAddress::LocalHost) QTC_ASSERT(server.listen(QHostAddress::LocalHost)
|| server.listen(QHostAddress::LocalHostIPv6), return 0); || server.listen(QHostAddress::LocalHostIPv6), return 0);
params.analyzerHost = server.serverAddress().toString(); params.analyzerHost = server.serverAddress().toString();
params.startMode = StartQmlRemote; params.startMode = StartLocal;
} }
AnalyzerRunControl *analyzerRunControl = AnalyzerManager::createRunControl(params, runConfig); AnalyzerRunControl *analyzerRunControl = AnalyzerManager::createRunControl(params, runConfig);

4
src/plugins/qmlprofiler/qmlprofilerengine.cpp
View File

@@ -120,7 +120,7 @@ bool QmlProfilerRunControl::startEngine()
} }
} }
if (startParameters().startMode == StartQmlRemote || startParameters().startMode == StartLocal) { if (startParameters().startMode == StartLocal) {
d->m_noDebugOutputTimer.start(); d->m_noDebugOutputTimer.start();
} else { } else {
emit processRunning(startParameters().analyzerPort); emit processRunning(startParameters().analyzerPort);
@@ -267,7 +267,7 @@ void QmlProfilerRunControl::processIsRunning(quint16 port)
{ {
d->m_noDebugOutputTimer.stop(); d->m_noDebugOutputTimer.stop();
if (port > 0 && mode() != StartQmlRemote) if (port > 0 && startParameters().analyzerPort != 0)
emit processRunning(port); emit processRunning(port);
} }

2
src/plugins/qnx/qnxruncontrolfactory.cpp
View File

@@ -125,7 +125,7 @@ static AnalyzerStartParameters createAnalyzerStartParameters(const QnxRunConfigu
return params; return params;
if (mode == QmlProfilerRunMode) if (mode == QmlProfilerRunMode)
params.startMode = StartQmlRemote; params.startMode = StartLocal;
params.debuggee = runConfig->remoteExecutableFilePath(); params.debuggee = runConfig->remoteExecutableFilePath();
params.debuggeeArgs = runConfig->arguments(); params.debuggeeArgs = runConfig->arguments();
params.connParams = DeviceKitInformation::device(runConfig->target()->kit())->sshParameters(); params.connParams = DeviceKitInformation::device(runConfig->target()->kit())->sshParameters();

7
src/plugins/remotelinux/remotelinuxanalyzesupport.cpp
View File

@@ -78,7 +78,7 @@ AnalyzerStartParameters RemoteLinuxAnalyzeSupport::startParameters(const RemoteL
{ {
AnalyzerStartParameters params; AnalyzerStartParameters params;
if (runMode == QmlProfilerRunMode) if (runMode == QmlProfilerRunMode)
params.startMode = StartQmlRemote; params.startMode = StartLocal;
params.runMode = runMode; params.runMode = runMode;
params.connParams = DeviceKitInformation::device(runConfig->target()->kit())->sshParameters(); params.connParams = DeviceKitInformation::device(runConfig->target()->kit())->sshParameters();
params.analyzerCmdPrefix = runConfig->commandPrefix(); params.analyzerCmdPrefix = runConfig->commandPrefix();
@@ -114,9 +114,6 @@ void RemoteLinuxAnalyzeSupport::showMessage(const QString &msg, Utils::OutputFor
void RemoteLinuxAnalyzeSupport::handleRemoteSetupRequested() void RemoteLinuxAnalyzeSupport::handleRemoteSetupRequested()
{ {
if (d->runControl->mode() != Analyzer::StartQmlRemote)
return;
QTC_ASSERT(state() == Inactive, return); QTC_ASSERT(state() == Inactive, return);
showMessage(tr("Checking available ports...\n"), Utils::NormalMessageFormat); showMessage(tr("Checking available ports...\n"), Utils::NormalMessageFormat);
@@ -169,8 +166,6 @@ void RemoteLinuxAnalyzeSupport::handleAppRunnerFinished(bool success)
void RemoteLinuxAnalyzeSupport::handleProfilingFinished() void RemoteLinuxAnalyzeSupport::handleProfilingFinished()
{ {
if (d->runControl->mode() != Analyzer::StartQmlRemote)
return;
setFinished(); setFinished();
} }