1 files changed, 12 insertions, 12 deletions
diff --git a/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp b/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp
index d1a77173c3..2f812a9952 100644
--- a/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp
+++ b/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp
@@ -1276,18 +1276,18 @@ void tst_QDataStream::readQCursor(QDataStream *s)
 
     QVERIFY(d5.shape() == test.shape()); //## lacks operator==
     QCOMPARE(d5.hotSpot(), test.hotSpot());
-    QVERIFY((d5.bitmap() != 0 && test.bitmap() != 0) || (d5.bitmap() == 0 && test.bitmap() == 0));
-    if (d5.bitmap() != 0) {
-        QPixmap actual = *(d5.bitmap());
-        QPixmap expected = *(test.bitmap());
-        QCOMPARE(actual, expected);
-    }
-    QVERIFY((d5.mask() != 0 && test.mask() != 0) || (d5.mask() == 0 && test.mask() == 0));
-    if (d5.mask() != 0) {
-        QPixmap actual = *(d5.mask());
-        QPixmap expected = *(test.mask());
-        QCOMPARE(actual, expected);
-    }
+
+    // Comparing non-null QBitmaps will fail. Upcast them first to pass.
+    QCOMPARE(d5.bitmap(Qt::ReturnByValue).isNull(), test.bitmap(Qt::ReturnByValue).isNull());
+    QCOMPARE(
+        static_cast<QPixmap>(d5.bitmap(Qt::ReturnByValue)),
+        static_cast<QPixmap>(test.bitmap(Qt::ReturnByValue))
+    );
+    QCOMPARE(d5.mask(Qt::ReturnByValue).isNull(), test.mask(Qt::ReturnByValue).isNull());
+    QCOMPARE(
+        static_cast<QPixmap>(d5.mask(Qt::ReturnByValue)),
+        static_cast<QPixmap>(test.mask(Qt::ReturnByValue))
+    );
 }
 #endif