Merge remote-tracking branch 'origin/5.10' into dev

Change-Id: I3878bbf2ac7b62651215938c98ead7171be49c74

3 files changed, 29 insertions, 12 deletions

diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp
index 510c745d4e..d676731ba7 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp
@@ -44,24 +44,36 @@
 
 QT_BEGIN_NAMESPACE
 
-QQmlProfilerAdapter::QQmlProfilerAdapter(QQmlProfilerService *service, QQmlEnginePrivate *engine) :
-    next(0)
+QQmlProfilerAdapter::QQmlProfilerAdapter(QQmlProfilerService *service, QQmlEnginePrivate *engine)
 {
-    setService(service);
     engine->profiler = new QQmlProfiler;
+    init(service, engine->profiler);
+}
+
+QQmlProfilerAdapter::QQmlProfilerAdapter(QQmlProfilerService *service, QQmlTypeLoader *loader)
+{
+    QQmlProfiler *profiler = new QQmlProfiler;
+    loader->setProfiler(profiler);
+    init(service, profiler);
+}
+
+void QQmlProfilerAdapter::init(QQmlProfilerService *service, QQmlProfiler *profiler)
+{
+    next = 0;
+    setService(service);
     connect(this, &QQmlProfilerAdapter::profilingEnabled,
-            engine->profiler, &QQmlProfiler::startProfiling);
+            profiler, &QQmlProfiler::startProfiling);
     connect(this, &QQmlAbstractProfilerAdapter::profilingEnabledWhileWaiting,
-            engine->profiler, &QQmlProfiler::startProfiling, Qt::DirectConnection);
+            profiler, &QQmlProfiler::startProfiling, Qt::DirectConnection);
     connect(this, &QQmlAbstractProfilerAdapter::profilingDisabled,
-            engine->profiler, &QQmlProfiler::stopProfiling);
+            profiler, &QQmlProfiler::stopProfiling);
     connect(this, &QQmlAbstractProfilerAdapter::profilingDisabledWhileWaiting,
-            engine->profiler, &QQmlProfiler::stopProfiling, Qt::DirectConnection);
+            profiler, &QQmlProfiler::stopProfiling, Qt::DirectConnection);
     connect(this, &QQmlAbstractProfilerAdapter::dataRequested,
-            engine->profiler, &QQmlProfiler::reportData);
+            profiler, &QQmlProfiler::reportData);
     connect(this, &QQmlAbstractProfilerAdapter::referenceTimeKnown,
-            engine->profiler, &QQmlProfiler::setTimer);
-    connect(engine->profiler, &QQmlProfiler::dataReady,
+            profiler, &QQmlProfiler::setTimer);
+    connect(profiler, &QQmlProfiler::dataReady,
             this, &QQmlProfilerAdapter::receiveData);
 }
 
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.h b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.h
index 1fee5c389f..7531cd1dff 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.h
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.h
@@ -60,6 +60,7 @@ class QQmlProfilerAdapter : public QQmlAbstractProfilerAdapter {
     Q_OBJECT
 public:
     QQmlProfilerAdapter(QQmlProfilerService *service, QQmlEnginePrivate *engine);
+    QQmlProfilerAdapter(QQmlProfilerService *service, QQmlTypeLoader *loader);
     qint64 sendMessages(qint64 until, QList<QByteArray> &messages,
                         bool trackLocations) Q_DECL_OVERRIDE;
 
@@ -67,6 +68,7 @@ public:
                      const QQmlProfiler::LocationHash &locations);
 
 private:
+    void init(QQmlProfilerService *service, QQmlProfiler *profiler);
     QVector<QQmlProfilerData> data;
     QQmlProfiler::LocationHash locations;
     int next;
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
index edeb364f60..4176ede40e 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
@@ -119,9 +119,12 @@ void QQmlProfilerServiceImpl::engineAboutToBeAdded(QJSEngine *engine)
 
     QMutexLocker lock(&m_configMutex);
     if (QQmlEngine *qmlEngine = qobject_cast<QQmlEngine *>(engine)) {
-        QQmlProfilerAdapter *qmlAdapter =
-                new QQmlProfilerAdapter(this, QQmlEnginePrivate::get(qmlEngine));
+        QQmlEnginePrivate *enginePrivate = QQmlEnginePrivate::get(qmlEngine);
+        QQmlProfilerAdapter *qmlAdapter = new QQmlProfilerAdapter(this, enginePrivate);
         addEngineProfiler(qmlAdapter, engine);
+        QQmlProfilerAdapter *compileAdapter
+                = new QQmlProfilerAdapter(this, &(enginePrivate->typeLoader));
+        addEngineProfiler(compileAdapter, engine);
     }
     QV4ProfilerAdapter *v4Adapter = new QV4ProfilerAdapter(this, QV8Engine::getV4(engine->handle()));
     addEngineProfiler(v4Adapter, engine);