Merge master <-> api_changes

Change-Id: Iad2f07b989b25349fd2d4fff010e24dcd5a1688f

1 files changed, 2 insertions, 4 deletions

diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index cde2885f0c..5cbb2f6943 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -1578,13 +1578,12 @@ void QQmlTypeData::downloadProgressChanged(qreal p)
 void QQmlTypeData::compile()
 {
     Q_ASSERT(m_compiledData == 0);
-    QQmlProfilerService::startRange(QQmlProfilerService::Compiling);
 
     m_compiledData = new QQmlCompiledData(typeLoader()->engine());
     m_compiledData->url = finalUrl();
     m_compiledData->name = finalUrlString();
-    QQmlProfilerService::rangeLocation(QQmlProfilerService::Compiling, QUrl(m_compiledData->name),1,1);
-    QQmlProfilerService::rangeData(QQmlProfilerService::Compiling, m_compiledData->name);
+
+    QQmlCompilingProfiler prof(m_compiledData->name);
 
     QQmlCompiler compiler(&scriptParser._pool);
     if (!compiler.compile(typeLoader()->engine(), this, m_compiledData)) {
@@ -1592,7 +1591,6 @@ void QQmlTypeData::compile()
         m_compiledData->release();
         m_compiledData = 0;
     }
-    QQmlProfilerService::endRange(QQmlProfilerService::Compiling);
 }
 
 void QQmlTypeData::resolveTypes()