Merge remote-tracking branch 'origin/dev' into wip/cmake

 Conflicts:
	dependencies.yaml
	src/qml/qml/qqmlengine.cpp

Change-Id: I6a73fd1064286f4a2232de85c2ce7f80452d4641

1 files changed, 28 insertions, 6 deletions

diff --git a/examples/quick/imageelements/image.qml b/examples/quick/imageelements/image.qml
index d414f59629..0750ea3b79 100644
--- a/examples/quick/imageelements/image.qml
+++ b/examples/quick/imageelements/image.qml
@@ -65,12 +65,34 @@ Rectangle {
         rows: 3
         spacing: 30
 
-        ImageCell { mode: Image.Stretch; caption: "Stretch" }
-        ImageCell { mode: Image.PreserveAspectFit; caption: "PreserveAspectFit" }
-        ImageCell { mode: Image.PreserveAspectCrop; caption: "PreserveAspectCrop" }
+        component SizedImageCell: ImageCell {
+            width: parent.cellWidth
+            height: parent.cellHeight
+        }
 
-        ImageCell { mode: Image.Tile; caption: "Tile" }
-        ImageCell { mode: Image.TileHorizontally; caption: "TileHorizontally" }
-        ImageCell { mode: Image.TileVertically; caption: "TileVertically" }
+        SizedImageCell {
+            mode: Image.Stretch
+            caption: "Stretch"
+        }
+        SizedImageCell {
+            mode: Image.PreserveAspectFit
+            caption: "PreserveAspectFit"
+        }
+        SizedImageCell {
+            mode: Image.PreserveAspectCrop
+            caption: "PreserveAspectCrop"
+        }
+        SizedImageCell {
+            mode: Image.Tile
+            caption: "Tile"
+        }
+        SizedImageCell {
+            mode: Image.TileHorizontally
+            caption: "TileHorizontally"
+        }
+        SizedImageCell {
+            mode: Image.TileVertically
+            caption: "TileVertically"
+        }
     }
 }