diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp | 9 | ||||
-rw-r--r-- | src/plugins/qmlprofiler/qmlprofilerruncontrol.h | 2 | ||||
-rw-r--r-- | src/plugins/qmlprofiler/qmlprofilertool.cpp | 2 |
3 files changed, 3 insertions, 10 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp index f77353fb0ae..159a1f68582 100644 --- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp @@ -163,11 +163,6 @@ void QmlProfilerRunner::profilerStateChanged() } } -QUrl QmlProfilerRunner::serverUrl() const -{ - return runControl()->qmlChannel(); -} - // // LocalQmlProfilerSupport // @@ -206,9 +201,9 @@ LocalQmlProfilerSupport::LocalQmlProfilerSupport(RunControl *runControl, const Q // In the TCP case, it doesn't hurt either to start the profiler before. addStartDependency(profiler); - setStartModifier([this, profiler, serverUrl] { + setStartModifier([this, runControl, serverUrl] { - QUrl serverUrl = profiler->serverUrl(); + QUrl serverUrl = runControl->qmlChannel(); QString code; if (serverUrl.scheme() == Utils::urlSocketScheme()) code = QString("file:%1").arg(serverUrl.path()); diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.h b/src/plugins/qmlprofiler/qmlprofilerruncontrol.h index c59748c83d8..8864885ee2f 100644 --- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.h +++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.h @@ -24,8 +24,6 @@ public: QmlProfilerRunner(ProjectExplorer::RunControl *runControl); ~QmlProfilerRunner() override; - QUrl serverUrl() const; - void registerProfilerStateManager( QmlProfilerStateManager *profilerState ); void cancelProcess(); diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index 7b554b22cfa..631f04cef67 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -429,7 +429,7 @@ void QmlProfilerTool::finalizeRunControl(QmlProfilerRunner *runWorker) infoBox->show(); }, Qt::QueuedConnection); // Queue any connection failures after reportStarted() - d->m_profilerConnections->connectToServer(runWorker->serverUrl()); + d->m_profilerConnections->connectToServer(runControl->qmlChannel()); d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppRunning); } |