From 1acd77ad525f40888333fe3a6e53789cdd5b5afa Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Tue, 27 Mar 2018 16:10:09 +0200
Subject: Qml Profiler: Store and send URL of compile events

Task-number: QTBUG-67354
Change-Id: I7251095570d5ba8d0a62d854cfcbc339b2455747
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/qml/debugger/qqmlprofiler_p.h                  |  2 +-
 .../tst_qqmlprofilerservice.cpp                    | 36 ++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/qml/debugger/qqmlprofiler_p.h b/src/qml/debugger/qqmlprofiler_p.h
index deb4d107d6..287c53ea05 100644
--- a/src/qml/debugger/qqmlprofiler_p.h
+++ b/src/qml/debugger/qqmlprofiler_p.h
@@ -190,7 +190,7 @@ public:
         }
 
         RefLocation(QQmlDataBlob *ref)
-            : Location(QQmlSourceLocation()), locationType(Compiling), sent(false)
+            : Location(QQmlSourceLocation(), ref->url()), locationType(Compiling), sent(false)
         {
             blob = ref;
             blob->addref();
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
index 87c123b85d..f2b44a4d95 100644
--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
@@ -221,6 +221,7 @@ private slots:
     void flushInterval();
     void translationBinding();
     void memory();
+    void compile();
 
 private:
     bool m_recordFromStart = true;
@@ -752,6 +753,41 @@ void tst_QQmlProfilerService::memory()
     QVERIFY(smallItems > 5);
 }
 
+void tst_QQmlProfilerService::compile()
+{
+    connect(true, "test.qml");
+
+    QTRY_VERIFY(m_client->numLoadedEventTypes() > 0);
+    m_client->client->setRecording(false);
+
+    checkTraceReceived();
+    checkJsHeap();
+
+    QQmlProfilerDefinitions::Message rangeStage = QQmlProfilerDefinitions::MaximumMessage;
+    for (auto message : m_client->qmlMessages) {
+        const QQmlProfilerEventType &type = m_client->types[message.typeIndex()];
+        if (type.rangeType() == QQmlProfilerDefinitions::Compiling) {
+            switch (rangeStage) {
+            case QQmlProfilerDefinitions::MaximumMessage:
+                QCOMPARE(message.rangeStage(), QQmlProfilerDefinitions::RangeStart);
+                break;
+            case QQmlProfilerDefinitions::RangeStart:
+                QCOMPARE(message.rangeStage(), QQmlProfilerDefinitions::RangeEnd);
+                break;
+            default:
+                QFAIL("Wrong range stage");
+            }
+            rangeStage = message.rangeStage();
+            QCOMPARE(type.message(), QQmlProfilerDefinitions::MaximumMessage);
+            QCOMPARE(type.location().filename(), testFileUrl("test.qml").toString());
+            QCOMPARE(type.location().line(), 0);
+            QCOMPARE(type.location().column(), 0);
+        }
+    }
+
+    QCOMPARE(rangeStage, QQmlProfilerDefinitions::RangeEnd);
+}
+
 QTEST_MAIN(tst_QQmlProfilerService)
 
 #include "tst_qqmlprofilerservice.moc"
-- 
cgit v1.2.3