From 434b51dca6acd0ba0efe60b80cdb9c2fc851db57 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 20 Jan 2016 18:45:02 +0100 Subject: [PATCH] QmlProfiler: finalize setup when starting Change-Id: If7cf8158bf4c0cd6a2ffff2d5157a98f2d8c0f50 Reviewed-by: hjk --- src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp | 6 +----- src/plugins/qmlprofiler/qmlprofilerruncontrol.h | 1 - src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp | 1 - src/plugins/qmlprofiler/qmlprofilertool.cpp | 1 - 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp index 7ab6f163367..f4d332fd4c0 100644 --- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp @@ -106,6 +106,7 @@ QmlProfilerRunControl::~QmlProfilerRunControl() bool QmlProfilerRunControl::startEngine() { + d->m_tool->finalizeRunControl(this); QTC_ASSERT(d->m_profilerState, return false); if (connection().analyzerPort != 0) @@ -252,11 +253,6 @@ void QmlProfilerRunControl::registerProfilerStateManager( QmlProfilerStateManage this, &QmlProfilerRunControl::profilerStateChanged); } -void QmlProfilerRunControl::finalizeSetup() -{ - d->m_tool->finalizeRunControl(this); -} - void QmlProfilerRunControl::profilerStateChanged() { switch (d->m_profilerState->currentState()) { diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.h b/src/plugins/qmlprofiler/qmlprofilerruncontrol.h index 5430a0ede6c..fd043f5ff55 100644 --- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.h +++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.h @@ -45,7 +45,6 @@ public: ~QmlProfilerRunControl(); void registerProfilerStateManager( QmlProfilerStateManager *profilerState ); - void finalizeSetup(); void notifyRemoteSetupDone(quint16 port); StopResult stop(); diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp index 8c615ce25a1..3408c470ef3 100644 --- a/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp @@ -98,7 +98,6 @@ RunControl *QmlProfilerRunControlFactory::create(RunConfiguration *runConfigurat runControl->setRunnable(runnable); runControl->setConnection(connection); - runControl->finalizeSetup(); LocalQmlProfilerRunner::Configuration conf; conf.executable = runnable.debuggee; diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index 58da7cbc3d8..aadb0635e6c 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -527,7 +527,6 @@ void QmlProfilerTool::startRemoteTool() auto runControl = qobject_cast(createRunControl(0)); runControl->setConnection(connection); - runControl->finalizeSetup(); ProjectExplorerPlugin::startRunControl(runControl, ProjectExplorer::Constants::QML_PROFILER_RUN_MODE); }