From 38d00cc8b66a1ca2cab5199762124c31bcd2c48a Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 27 Sep 2017 14:56:00 +0200 Subject: [PATCH] QmlProfiler: Use a Target for populateFileFinder() The RunConfiguration we were using previously only served to retrieve a target. Change-Id: I30628197de3025511a03a53d3119083b980762c8 Reviewed-by: hjk --- src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp | 10 +++------- src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.h | 2 +- src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp | 4 ++-- src/plugins/qmlprofiler/qmlprofilermodelmanager.h | 4 ++-- src/plugins/qmlprofiler/qmlprofilertool.cpp | 3 ++- .../tests/qmlprofilerdetailsrewriter_test.cpp | 4 +--- 6 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp b/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp index 59d236cc1ab..fe90e76406f 100644 --- a/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp @@ -206,13 +206,9 @@ void QmlProfilerDetailsRewriter::documentReady(QmlJS::Document::Ptr doc) } } -void QmlProfilerDetailsRewriter::populateFileFinder( - const ProjectExplorer::RunConfiguration *runConfiguration) +void QmlProfilerDetailsRewriter::populateFileFinder(const ProjectExplorer::Target *target) { - // Prefer the given runConfiguration's target if available - const ProjectExplorer::Target *target = runConfiguration ? runConfiguration->target() : nullptr; - - // If runConfiguration given, then use the project associated with that ... + // If target given, then use the project associated with that ... const ProjectExplorer::Project *startupProject = target ? target->project() : nullptr; // ... else try the session manager's global startup project ... @@ -239,7 +235,7 @@ void QmlProfilerDetailsRewriter::populateFileFinder( sourceFiles.append(project->files(ProjectExplorer::Project::SourceFiles)); } - // If no runConfiguration was given, but we've found a startupProject, then try to deduct a + // If no target was given, but we've found a startupProject, then try to deduct a // target from that. if (!target && startupProject) target = startupProject->activeTarget(); diff --git a/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.h b/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.h index ae0b55cde7c..e58c336cfd2 100644 --- a/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.h +++ b/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.h @@ -46,7 +46,7 @@ public: void requestDetailsForLocation(int typeId, const QmlEventLocation &location); QString getLocalFile(const QString &remoteFile); void reloadDocuments(); - void populateFileFinder(const ProjectExplorer::RunConfiguration *runConfiguration); + void populateFileFinder(const ProjectExplorer::Target *target); signals: void rewriteDetailsString(int typeId, const QString &details); diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp index 7c85817841e..a7566fd2c05 100644 --- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp +++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp @@ -524,9 +524,9 @@ void QmlProfilerModelManager::processingDone() setState(Done); } -void QmlProfilerModelManager::populateFileFinder(const ProjectExplorer::RunConfiguration *runConfiguration) +void QmlProfilerModelManager::populateFileFinder(const ProjectExplorer::Target *target) { - d->detailsRewriter->populateFileFinder(runConfiguration); + d->detailsRewriter->populateFileFinder(target); } QString QmlProfilerModelManager::findLocalFile(const QString &remoteFile) diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.h b/src/plugins/qmlprofiler/qmlprofilermodelmanager.h index f09537667e5..f5fb7158223 100644 --- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.h +++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.h @@ -37,7 +37,7 @@ #include #include -namespace ProjectExplorer { class RunConfiguration; } +namespace ProjectExplorer { class Target; } namespace QmlProfiler { class QmlProfilerModelManager; @@ -129,7 +129,7 @@ public: void acquiringDone(); void processingDone(); - void populateFileFinder(const ProjectExplorer::RunConfiguration *runConfiguration = nullptr); + void populateFileFinder(const ProjectExplorer::Target *target = nullptr); QString findLocalFile(const QString &remoteFile); static const char *featureName(ProfileFeature feature); diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index 3488c93f14d..225fafed3c4 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -393,7 +393,8 @@ void QmlProfilerTool::finalizeRunControl(QmlProfilerRunner *runWorker) // Initialize m_projectFinder // - d->m_profilerModelManager->populateFileFinder(runConfiguration); + d->m_profilerModelManager->populateFileFinder(runConfiguration ? runConfiguration->target() + : nullptr); } void QmlProfilerTool::recordingButtonChanged(bool recording) diff --git a/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp b/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp index 3363619d782..41966381cf9 100644 --- a/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp +++ b/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp @@ -202,9 +202,7 @@ void QmlProfilerDetailsRewriterTest::seedRewriter() ProjectExplorer::SessionManager::addProject(project); ProjectExplorer::Target *target = project->createTarget(kit); - ProjectExplorer::CustomExecutableRunConfiguration *rc - = new ProjectExplorer::CustomExecutableRunConfiguration(target); - m_rewriter.populateFileFinder(rc); + m_rewriter.populateFileFinder(target); ProjectExplorer::SessionManager::removeProject(project); ProjectExplorer::KitManager::deleteKit(kit); }