forked from qt-creator/qt-creator
QmlProfiler: Remove QmlProfilerRunner::serverUrl()
There's more direct access using runControl()->qmlChannel() nowadays. Change-Id: Ie2797800d6ad8949faae0140db343f0bfc8eaf76 Reviewed-by: Andrii Semkiv <andrii.semkiv@qt.io> Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -163,11 +163,6 @@ void QmlProfilerRunner::profilerStateChanged()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
QUrl QmlProfilerRunner::serverUrl() const
|
|
||||||
{
|
|
||||||
return runControl()->qmlChannel();
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// LocalQmlProfilerSupport
|
// 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.
|
// In the TCP case, it doesn't hurt either to start the profiler before.
|
||||||
addStartDependency(profiler);
|
addStartDependency(profiler);
|
||||||
|
|
||||||
setStartModifier([this, profiler, serverUrl] {
|
setStartModifier([this, runControl, serverUrl] {
|
||||||
|
|
||||||
QUrl serverUrl = profiler->serverUrl();
|
QUrl serverUrl = runControl->qmlChannel();
|
||||||
QString code;
|
QString code;
|
||||||
if (serverUrl.scheme() == Utils::urlSocketScheme())
|
if (serverUrl.scheme() == Utils::urlSocketScheme())
|
||||||
code = QString("file:%1").arg(serverUrl.path());
|
code = QString("file:%1").arg(serverUrl.path());
|
||||||
|
@@ -24,8 +24,6 @@ public:
|
|||||||
QmlProfilerRunner(ProjectExplorer::RunControl *runControl);
|
QmlProfilerRunner(ProjectExplorer::RunControl *runControl);
|
||||||
~QmlProfilerRunner() override;
|
~QmlProfilerRunner() override;
|
||||||
|
|
||||||
QUrl serverUrl() const;
|
|
||||||
|
|
||||||
void registerProfilerStateManager( QmlProfilerStateManager *profilerState );
|
void registerProfilerStateManager( QmlProfilerStateManager *profilerState );
|
||||||
|
|
||||||
void cancelProcess();
|
void cancelProcess();
|
||||||
|
@@ -429,7 +429,7 @@ void QmlProfilerTool::finalizeRunControl(QmlProfilerRunner *runWorker)
|
|||||||
infoBox->show();
|
infoBox->show();
|
||||||
}, Qt::QueuedConnection); // Queue any connection failures after reportStarted()
|
}, 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);
|
d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppRunning);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user