1 files changed, 11 insertions, 7 deletions
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
index 52c9953970..c4b17aa60a 100644
--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
@@ -609,12 +609,11 @@ void tst_QQmlProfilerService::scenegraphData()
     checkTraceReceived();
     checkJsHeap();
 
-
-    // check that at least one frame was rendered
-    // there should be a SGPolishAndSync + SGRendererFrame + SGRenderLoopFrame sequence
-    // (though we can't be sure to get the SGRenderLoopFrame in the threaded renderer)
+    // Check that at least one frame was rendered.
+    // There should be a SGContextFrame + SGRendererFrame + SGRenderLoopFrame sequence,
+    // but we can't be sure to get the SGRenderLoopFrame in the threaded renderer.
     //
-    // since the rendering happens in a different thread, there could be other unrelated events
+    // Since the rendering happens in a different thread, there could be other unrelated events
     // interleaved. Also, events could carry the same time stamps and be sorted in an unexpected way
     // if the clocks are acting up.
     qint64 contextFrameTime = -1;
@@ -643,8 +642,13 @@ void tst_QQmlProfilerService::scenegraphData()
 
     foreach (const QQmlProfilerData &msg, m_client->asynchronousMessages) {
         if (msg.detailType == QQmlProfilerDefinitions::SceneGraphRenderLoopFrame) {
-            QVERIFY(msg.time >= renderFrameTime);
-            break;
+            if (msg.time >= contextFrameTime) {
+                // Make sure SceneGraphRenderLoopFrame is not between SceneGraphContextFrame and
+                // SceneGraphRendererFrame. A SceneGraphRenderLoopFrame before everything else is
+                // OK as the scene graph might decide to do an initial rendering.
+                QVERIFY(msg.time >= renderFrameTime);
+                break;
+            }
         }
     }
 }