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

QmlProfiler: finalize setup when starting

Browse Source 
Change-Id: If7cf8158bf4c0cd6a2ffff2d5157a98f2d8c0f50
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2016-01-20 18:45:02 +01:00
parent b85c0204a0
commit 434b51dca6
4 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
View File

@@ -106,6 +106,7 @@ QmlProfilerRunControl::~QmlProfilerRunControl()
bool QmlProfilerRunControl::startEngine() bool QmlProfilerRunControl::startEngine()
{ {
d->m_tool->finalizeRunControl(this);
QTC_ASSERT(d->m_profilerState, return false); QTC_ASSERT(d->m_profilerState, return false);
if (connection().analyzerPort != 0) if (connection().analyzerPort != 0)
@@ -252,11 +253,6 @@ void QmlProfilerRunControl::registerProfilerStateManager( QmlProfilerStateManage
this, &QmlProfilerRunControl::profilerStateChanged); this, &QmlProfilerRunControl::profilerStateChanged);
} }
void QmlProfilerRunControl::finalizeSetup()
{
d->m_tool->finalizeRunControl(this);
}
void QmlProfilerRunControl::profilerStateChanged() void QmlProfilerRunControl::profilerStateChanged()
{ {
switch (d->m_profilerState->currentState()) { switch (d->m_profilerState->currentState()) {

1
src/plugins/qmlprofiler/qmlprofilerruncontrol.h
View File

@@ -45,7 +45,6 @@ public:
~QmlProfilerRunControl(); ~QmlProfilerRunControl();
void registerProfilerStateManager( QmlProfilerStateManager *profilerState ); void registerProfilerStateManager( QmlProfilerStateManager *profilerState );
void finalizeSetup();
void notifyRemoteSetupDone(quint16 port); void notifyRemoteSetupDone(quint16 port);
StopResult stop(); StopResult stop();

1
src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp
View File

@@ -98,7 +98,6 @@ RunControl *QmlProfilerRunControlFactory::create(RunConfiguration *runConfigurat
runControl->setRunnable(runnable); runControl->setRunnable(runnable);
runControl->setConnection(connection); runControl->setConnection(connection);
runControl->finalizeSetup();
LocalQmlProfilerRunner::Configuration conf; LocalQmlProfilerRunner::Configuration conf;
conf.executable = runnable.debuggee; conf.executable = runnable.debuggee;

1
src/plugins/qmlprofiler/qmlprofilertool.cpp
View File

@@ -527,7 +527,6 @@ void QmlProfilerTool::startRemoteTool()
auto runControl = qobject_cast<QmlProfilerRunControl *>(createRunControl(0)); auto runControl = qobject_cast<QmlProfilerRunControl *>(createRunControl(0));
runControl->setConnection(connection); runControl->setConnection(connection);
runControl->finalizeSetup();
ProjectExplorerPlugin::startRunControl(runControl, ProjectExplorer::Constants::QML_PROFILER_RUN_MODE); ProjectExplorerPlugin::startRunControl(runControl, ProjectExplorer::Constants::QML_PROFILER_RUN_MODE);
} }