From 72420889aa54342da4472683e67e2c70b76a170f Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@digia.com>
Date: Fri, 24 Jan 2014 12:44:49 +0100
Subject: Add dedicated QML profiler and adapter

The remaining "profiling" parts of the QML profiler service are
engine specific and are best accessed through their own adapter.

Change-Id: Idb763104bdd80e4dabdf132ec1a496b9bc9f6f46
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
---
 src/qml/qml/qqmltypeloader.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/qml/qml/qqmltypeloader.cpp')

diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index 7c32d4f19c..1b947c421a 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -49,7 +49,7 @@
 #include <private/qqmlthread_p.h>
 #include <private/qqmlcompiler_p.h>
 #include <private/qqmlcomponent_p.h>
-#include <private/qqmlprofilerservice_p.h>
+#include <private/qqmlprofiler_p.h>
 #include <private/qqmlmemoryprofiler_p.h>
 #include <private/qqmlcodegenerator_p.h>
 #include <private/qqmltypecompiler_p.h>
@@ -2304,7 +2304,7 @@ void QQmlTypeData::compile()
     m_compiledData->url = finalUrl();
     m_compiledData->name = finalUrlString();
 
-    QQmlCompilingProfiler prof(m_compiledData->name);
+    QQmlCompilingProfiler prof(QQmlEnginePrivate::get(typeLoader()->engine())->profiler, m_compiledData->name);
 
     if (m_useNewCompiler) {
         QQmlTypeCompiler compiler(QQmlEnginePrivate::get(typeLoader()->engine()), m_compiledData, this, parsedQML.data());
-- 
cgit v1.2.3