From d8a41f27064a1a168c84fcdbe6573581750b536c Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Wed, 27 Sep 2017 14:57:05 +0200
Subject: QmlProfiler: Add QT_INSTALL_QML paths to FileInProjectFinder

This enables us to find QML files that are part of Qt, also if they are
not in the same location on the host and target systems.

Change-Id: Idcd0be8ae4301000c4123e39edeb04b43efb4659
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp')

diff --git a/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp b/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp
index fe90e76406f..3bc12296b49 100644
--- a/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp
@@ -34,6 +34,7 @@
 #include <qmljs/parser/qmljsast_p.h>
 #include <qmljs/qmljsmodelmanagerinterface.h>
 #include <qmljstools/qmljsmodelmanager.h>
+#include <qtsupport/qtkitinformation.h>
 
 #include <utils/qtcassert.h>
 
@@ -242,16 +243,21 @@ void QmlProfilerDetailsRewriter::populateFileFinder(const ProjectExplorer::Targe
 
     // ... and find the sysroot if we have any target at all.
     QString activeSysroot;
+    QStringList additionalSearchDirectories;
     if (target) {
-        const ProjectExplorer::Kit *kit = target->kit();
-        if (kit && ProjectExplorer::SysRootKitInformation::hasSysRoot(kit))
-            activeSysroot = ProjectExplorer::SysRootKitInformation::sysRoot(kit).toString();
+        if (const ProjectExplorer::Kit *kit = target->kit()) {
+            if (ProjectExplorer::SysRootKitInformation::hasSysRoot(kit))
+                activeSysroot = ProjectExplorer::SysRootKitInformation::sysRoot(kit).toString();
+            if (QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(kit))
+                additionalSearchDirectories.append(qtVersion->qmakeProperty("QT_INSTALL_QML"));
+        }
     }
 
     // Finally, do populate m_projectFinder
     m_projectFinder.setProjectDirectory(projectDirectory);
     m_projectFinder.setProjectFiles(sourceFiles);
     m_projectFinder.setSysroot(activeSysroot);
+    m_projectFinder.setAdditionalSearchDirectories(additionalSearchDirectories);
     m_filesCache.clear();
 }
 
-- 
cgit v1.2.3