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

Change-Id: I68a6ed3184e62fa89c47c564bb01002c0918d0fd

1 files changed, 8 insertions, 0 deletions

diff --git a/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp
index f7e7022059..2822279190 100644
--- a/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp
@@ -159,6 +159,14 @@ void tst_QGraphicsPixmapItem::contains()
     QFETCH(QPointF, point);
     QFETCH(bool, contains);
 
+    // At the time of writing, by default pixmaps will have:
+    //  - The same pixel format of the primary screen (which is platform dependent and may contain alpha)
+    //  - Uninitialized pixels, potentially including an alpha channel
+    //  - A ShapeMode of Mask (which mean it will use the alpha channel as a mask for contains())
+    // This means that in order to prevent undefined behavior in this test, we either need to set
+    // the shapeMode to something else, or set the pixels of the pixmap.
+    pixmap.fill(); // Filling the pixmap to be on the safe side.
+
     SubQGraphicsPixmapItem item(pixmap);
     QCOMPARE(item.contains(point), contains);
 }