From e61c797c6d811d9ee3b7546af8fa05ee9ee2546b Mon Sep 17 00:00:00 2001
From: Aurindam Jana <aurindam.jana@digia.com>
Date: Fri, 2 Aug 2013 16:33:42 +0200
Subject: [PATCH] QmlProfiler: Use StartLocal instead of StartQml start mode.
Change-Id: Iee7895e9cafc373c32749f3dcc44a690dfc551bc
Reviewed-by: hjk <hjk121@nokiamail.com>
---
src/plugins/analyzerbase/analyzerconstants.h | 1 -
src/plugins/analyzerbase/ianalyzertool.cpp | 1 -
src/plugins/qmlprofiler/localqmlprofilerrunner.cpp | 4 ++--
src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp | 2 +-
4 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/plugins/analyzerbase/analyzerconstants.h b/src/plugins/analyzerbase/analyzerconstants.h
index 5034e5531dc..e5b0babdb02 100644
--- a/src/plugins/analyzerbase/analyzerconstants.h
+++ b/src/plugins/analyzerbase/analyzerconstants.h
@@ -44,7 +44,6 @@ enum StartMode
{
StartLocal = -1,
StartRemote = -2,
- StartQml = -3,
StartQmlRemote = -4 // TODO: remove this enum and make it generic
};
diff --git a/src/plugins/analyzerbase/ianalyzertool.cpp b/src/plugins/analyzerbase/ianalyzertool.cpp
index 25394f0b569..1223a64bddd 100644
--- a/src/plugins/analyzerbase/ianalyzertool.cpp
+++ b/src/plugins/analyzerbase/ianalyzertool.cpp
@@ -68,7 +68,6 @@ Id IAnalyzerTool::actionId(StartMode mode) const
return id.withSuffix(".Local");
case StartRemote:
return id.withSuffix(".Remote");
- case StartQml:
case StartQmlRemote:
return id.withSuffix(".Qml");
}
diff --git a/src/plugins/qmlprofiler/localqmlprofilerrunner.cpp b/src/plugins/qmlprofiler/localqmlprofilerrunner.cpp
index 852ddd62a75..14f7de97dd5 100644
--- a/src/plugins/qmlprofiler/localqmlprofilerrunner.cpp
+++ b/src/plugins/qmlprofiler/localqmlprofilerrunner.cpp
@@ -97,7 +97,7 @@ LocalQmlProfilerRunner::~LocalQmlProfilerRunner()
void LocalQmlProfilerRunner::start()
{
- if (m_engine->mode() != Analyzer::StartQml)
+ if (m_engine->mode() != Analyzer::StartLocal)
return;
QString arguments = QString::fromLatin1("-qmljsdebugger=port:%1,block").arg(m_configuration.port);
@@ -136,7 +136,7 @@ void LocalQmlProfilerRunner::spontaneousStop(int exitCode, QProcess::ExitStatus
void LocalQmlProfilerRunner::stop()
{
- if (m_engine->mode() != Analyzer::StartQml)
+ if (m_engine->mode() != Analyzer::StartLocal)
return;
if (QmlProfilerPlugin::debugOutput)
diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp
index ba9848f3258..7c5246c1aeb 100644
--- a/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp
@@ -108,7 +108,7 @@ static AnalyzerStartParameters createQmlProfilerStartParameters(RunConfiguration
sp.analyzerHost = server.serverAddress().toString();
sp.analyzerPort = server.serverPort();
}
- sp.startMode = StartQml;
+ sp.startMode = StartLocal;
return sp;
}
--
GitLab