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

Conflicts:
	src/quick/items/qquickimagebase.cpp
	src/imports/layouts/plugin.cpp

Change-Id: I5f48474df4034a1347ec74795c85d369a55b6b21

1 files changed, 20 insertions, 0 deletions

diff --git a/tests/benchmarks/qml/creation/tst_creation.cpp b/tests/benchmarks/qml/creation/tst_creation.cpp
index 224732913c..e126cdae7e 100644
--- a/tests/benchmarks/qml/creation/tst_creation.cpp
+++ b/tests/benchmarks/qml/creation/tst_creation.cpp
@@ -68,6 +68,8 @@ private slots:
     void itemtests_qml_data();
     void itemtests_qml();
 
+    void anchors_heightChange();
+
 private:
     QQmlEngine engine;
 };
@@ -373,6 +375,24 @@ void tst_creation::itemtests_qml()
     QBENCHMARK { delete component.create(); }
 }
 
+void tst_creation::anchors_heightChange()
+{
+    QQmlComponent component(&engine);
+    component.setData("import QtQuick 2.0\nItem { Item { anchors.bottom: parent.bottom } }", QUrl());
+
+    QObject *obj = component.create();
+    auto item = qobject_cast<QQuickItem *>(obj);
+    Q_ASSERT(item);
+    int height = 1;
+
+    QBENCHMARK {
+        item->setHeight(height);
+        height += 1;
+    }
+
+    delete obj;
+}
+
 QTEST_MAIN(tst_creation)
 
 #include "tst_creation.moc"