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

QmlProfiler: Avoid a direct use of runControl->runConfiguration()

Browse Source 
Change-Id: Ib9caba243c3a41b11ff983b9ce764f69faeb8829
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
hjk
2019-03-19 17:46:08 +01:00
parent 1bc10248c0
commit e6adb8aabf
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -300,18 +300,14 @@ void QmlProfilerTool::finalizeRunControl(QmlProfilerRunner *runWorker)
{ {
d->m_toolBusy = true; d->m_toolBusy = true;
auto runControl = runWorker->runControl(); auto runControl = runWorker->runControl();
auto runConfiguration = runControl->runConfiguration(); if (auto aspect = static_cast<QmlProfilerRunConfigurationAspect *>(
if (runConfiguration) { runControl->aspect(Constants::SETTINGS))) {
auto aspect = static_cast<QmlProfilerRunConfigurationAspect *>(
runControl->aspect(Constants::SETTINGS));
if (aspect) {
if (auto settings = static_cast<const QmlProfilerSettings *>(aspect->currentSettings())) { if (auto settings = static_cast<const QmlProfilerSettings *>(aspect->currentSettings())) {
d->m_profilerConnections->setFlushInterval(settings->flushEnabled() ? d->m_profilerConnections->setFlushInterval(settings->flushEnabled() ?
settings->flushInterval() : 0); settings->flushInterval() : 0);
d->m_profilerModelManager->setAggregateTraces(settings->aggregateTraces()); d->m_profilerModelManager->setAggregateTraces(settings->aggregateTraces());
} }
} }
}
auto handleStop = [this, runControl]() { auto handleStop = [this, runControl]() {
d->m_toolBusy = false; d->m_toolBusy = false;
@@ -341,8 +337,7 @@ void QmlProfilerTool::finalizeRunControl(QmlProfilerRunner *runWorker)
// Initialize m_projectFinder // Initialize m_projectFinder
// //
d->m_profilerModelManager->populateFileFinder(runConfiguration ? runConfiguration->target() d->m_profilerModelManager->populateFileFinder(runControl->target());
: nullptr);
connect(d->m_profilerConnections, &QmlProfilerClientManager::connectionFailed, connect(d->m_profilerConnections, &QmlProfilerClientManager::connectionFailed,
runWorker, [this, runWorker]() { runWorker, [this, runWorker]() {