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

 Conflicts:
	src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
	tests/auto/qml/qjsengine/tst_qjsengine.cpp

Change-Id: I8276669e257f35a76768ef7f8795a8605cf4c9bc

1 files changed, 39 insertions, 0 deletions

diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
index cd8e4216f3..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;
@@ -525,6 +526,8 @@ void tst_QQmlProfilerService::connect()
 
     if (!traceEnabled)
         m_client->client->setRecording(true);
+
+    QTRY_VERIFY(m_client->numLoadedEventTypes() > 0);
     m_client->client->setRecording(false);
     checkTraceReceived();
     checkJsHeap();
@@ -643,6 +646,7 @@ void tst_QQmlProfilerService::controlFromJS()
 {
     QCOMPARE(connect(true, "controlFromJS.qml", false), ConnectSuccess);
 
+    QTRY_VERIFY(m_client->numLoadedEventTypes() > 0);
     m_client->client->setRecording(false);
     checkTraceReceived();
     checkJsHeap();
@@ -749,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"