From e6adb8aabf2b74468e27fdb9f4e5f4e4756b4a40 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 19 Mar 2019 17:46:08 +0100 Subject: [PATCH] QmlProfiler: Avoid a direct use of runControl->runConfiguration() Change-Id: Ib9caba243c3a41b11ff983b9ce764f69faeb8829 Reviewed-by: Ulf Hermann --- src/plugins/qmlprofiler/qmlprofilertool.cpp | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index a6e5850076b..0e87673c7f6 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -300,16 +300,12 @@ void QmlProfilerTool::finalizeRunControl(QmlProfilerRunner *runWorker) { d->m_toolBusy = true; auto runControl = runWorker->runControl(); - auto runConfiguration = runControl->runConfiguration(); - if (runConfiguration) { - auto aspect = static_cast( - runControl->aspect(Constants::SETTINGS)); - if (aspect) { - if (auto settings = static_cast(aspect->currentSettings())) { - d->m_profilerConnections->setFlushInterval(settings->flushEnabled() ? - settings->flushInterval() : 0); - d->m_profilerModelManager->setAggregateTraces(settings->aggregateTraces()); - } + if (auto aspect = static_cast( + runControl->aspect(Constants::SETTINGS))) { + if (auto settings = static_cast(aspect->currentSettings())) { + d->m_profilerConnections->setFlushInterval(settings->flushEnabled() ? + settings->flushInterval() : 0); + d->m_profilerModelManager->setAggregateTraces(settings->aggregateTraces()); } } @@ -341,8 +337,7 @@ void QmlProfilerTool::finalizeRunControl(QmlProfilerRunner *runWorker) // Initialize m_projectFinder // - d->m_profilerModelManager->populateFileFinder(runConfiguration ? runConfiguration->target() - : nullptr); + d->m_profilerModelManager->populateFileFinder(runControl->target()); connect(d->m_profilerConnections, &QmlProfilerClientManager::connectionFailed, runWorker, [this, runWorker]() {