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

QmlProfiler: Use a Target for populateFileFinder()

Browse Source 
The RunConfiguration we were using previously only served to retrieve a
target.

Change-Id: I30628197de3025511a03a53d3119083b980762c8
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Ulf Hermann
2017-09-27 14:56:00 +02:00
parent c0b2ba829f
commit 38d00cc8b6
6 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp
View File

@@ -206,13 +206,9 @@ void QmlProfilerDetailsRewriter::documentReady(QmlJS::Document::Ptr doc)
} }
} }
void QmlProfilerDetailsRewriter::populateFileFinder( void QmlProfilerDetailsRewriter::populateFileFinder(const ProjectExplorer::Target *target)
const ProjectExplorer::RunConfiguration *runConfiguration)
{ {
// Prefer the given runConfiguration's target if available // If target given, then use the project associated with that ...
const ProjectExplorer::Target *target = runConfiguration ? runConfiguration->target() : nullptr;
// If runConfiguration given, then use the project associated with that ...
const ProjectExplorer::Project *startupProject = target ? target->project() : nullptr; const ProjectExplorer::Project *startupProject = target ? target->project() : nullptr;
// ... else try the session manager's global startup project ... // ... else try the session manager's global startup project ...
@@ -239,7 +235,7 @@ void QmlProfilerDetailsRewriter::populateFileFinder(
sourceFiles.append(project->files(ProjectExplorer::Project::SourceFiles)); 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. // target from that.
if (!target && startupProject) if (!target && startupProject)
target = startupProject->activeTarget(); target = startupProject->activeTarget();

2
src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.h
View File

@@ -46,7 +46,7 @@ public:
void requestDetailsForLocation(int typeId, const QmlEventLocation &location); void requestDetailsForLocation(int typeId, const QmlEventLocation &location);
QString getLocalFile(const QString &remoteFile); QString getLocalFile(const QString &remoteFile);
void reloadDocuments(); void reloadDocuments();
void populateFileFinder(const ProjectExplorer::RunConfiguration *runConfiguration); void populateFileFinder(const ProjectExplorer::Target *target);
signals: signals:
void rewriteDetailsString(int typeId, const QString &details); void rewriteDetailsString(int typeId, const QString &details);

4
src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
View File

@@ -524,9 +524,9 @@ void QmlProfilerModelManager::processingDone()
setState(Done); 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) QString QmlProfilerModelManager::findLocalFile(const QString &remoteFile)

4
src/plugins/qmlprofiler/qmlprofilermodelmanager.h
View File

@@ -37,7 +37,7 @@
#include <QObject> #include <QObject>
#include <functional> #include <functional>
namespace ProjectExplorer { class RunConfiguration; } namespace ProjectExplorer { class Target; }
namespace QmlProfiler { namespace QmlProfiler {
class QmlProfilerModelManager; class QmlProfilerModelManager;
@@ -129,7 +129,7 @@ public:
void acquiringDone(); void acquiringDone();
void processingDone(); void processingDone();
void populateFileFinder(const ProjectExplorer::RunConfiguration *runConfiguration = nullptr); void populateFileFinder(const ProjectExplorer::Target *target = nullptr);
QString findLocalFile(const QString &remoteFile); QString findLocalFile(const QString &remoteFile);
static const char *featureName(ProfileFeature feature); static const char *featureName(ProfileFeature feature);

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

@@ -393,7 +393,8 @@ void QmlProfilerTool::finalizeRunControl(QmlProfilerRunner *runWorker)
// Initialize m_projectFinder // Initialize m_projectFinder
// //
d->m_profilerModelManager->populateFileFinder(runConfiguration); d->m_profilerModelManager->populateFileFinder(runConfiguration ? runConfiguration->target()
: nullptr);
} }
void QmlProfilerTool::recordingButtonChanged(bool recording) void QmlProfilerTool::recordingButtonChanged(bool recording)

4
src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp
View File

@@ -202,9 +202,7 @@ void QmlProfilerDetailsRewriterTest::seedRewriter()
ProjectExplorer::SessionManager::addProject(project); ProjectExplorer::SessionManager::addProject(project);
ProjectExplorer::Target *target = project->createTarget(kit); ProjectExplorer::Target *target = project->createTarget(kit);
ProjectExplorer::CustomExecutableRunConfiguration *rc m_rewriter.populateFileFinder(target);
= new ProjectExplorer::CustomExecutableRunConfiguration(target);
m_rewriter.populateFileFinder(rc);
ProjectExplorer::SessionManager::removeProject(project); ProjectExplorer::SessionManager::removeProject(project);
ProjectExplorer::KitManager::deleteKit(kit); ProjectExplorer::KitManager::deleteKit(kit);
} }