Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	examples/quick/demos/photoviewer/deployment.pri
One side made it redundant; the other removed part of it; remove it all !

	src/quick/scenegraph/util/qsgatlastexture.cpp
One side changed a preprocessor condition, the other a code condition,
on adjacent lines; keep both changes.

	tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
One side changed a condition, the other the content of its block; keep both.

Change-Id: Idb8937f92a7edb28212449dfe0c5cfdb8e6de986

3 files changed, 38 insertions, 6 deletions

diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
index 042f24c1d5..4f9088d67d 100644
--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
@@ -588,11 +588,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;
@@ -621,8 +621,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;
+            }
         }
     }
 }
diff --git a/tests/auto/qml/qqmlecmascript/data/qtbug_54589.qml b/tests/auto/qml/qqmlecmascript/data/qtbug_54589.qml
new file mode 100644
index 0000000000..8f7d5f2a70
--- /dev/null
+++ b/tests/auto/qml/qqmlecmascript/data/qtbug_54589.qml
@@ -0,0 +1,16 @@
+import QtQuick 2.0
+
+QtObject {
+    function checkPropertyDeletion() {
+        var o = {
+            x: 1,
+            y: 2
+        };
+        o.z = 3
+        delete o.y;
+
+        return (o.x === 1 && o.y === undefined && o.z === 3)
+    }
+
+    property bool result: checkPropertyDeletion()
+}
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
index 29f81cd063..f185fea1d5 100644
--- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
+++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
@@ -323,6 +323,7 @@ private slots:
     void switchExpression();
     void qtbug_46022();
     void qtbug_52340();
+    void qtbug_54589();
 
 private:
 //    static void propertyVarWeakRefCallback(v8::Persistent<v8::Value> object, void* parameter);
@@ -7915,6 +7916,16 @@ void tst_qqmlecmascript::qtbug_52340()
     QVERIFY(returnValue.toBool());
 }
 
+void tst_qqmlecmascript::qtbug_54589()
+{
+    QQmlComponent component(&engine, testFileUrl("qtbug_54589.qml"));
+
+    QScopedPointer<QObject> obj(component.create());
+    QVERIFY(obj != 0);
+    QCOMPARE(obj->property("result").toBool(), true);
+}
+
+
 QTEST_MAIN(tst_qqmlecmascript)
 
 #include "tst_qqmlecmascript.moc"