1 files changed, 18 insertions, 12 deletions
diff --git a/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp b/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp
index 8197c386c5..aed84cb14e 100644
--- a/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp
+++ b/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp
@@ -1170,18 +1170,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
 
@@ -3296,7 +3296,10 @@ void tst_QDataStream::streamRealDataTypes()
         QCOMPARE(col, color);
         stream >> rGrad;
         QCOMPARE(rGrad.style(), radialBrush.style());
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
         QCOMPARE(rGrad.matrix(), radialBrush.matrix());
+QT_WARNING_POP
         QCOMPARE(rGrad.gradient()->type(), radialBrush.gradient()->type());
         QCOMPARE(rGrad.gradient()->stops(), radialBrush.gradient()->stops());
         QCOMPARE(rGrad.gradient()->spread(), radialBrush.gradient()->spread());
@@ -3305,7 +3308,10 @@ void tst_QDataStream::streamRealDataTypes()
         QCOMPARE(((QRadialGradient *)rGrad.gradient())->radius(), ((QRadialGradient *)radialBrush.gradient())->radius());
         stream >> cGrad;
         QCOMPARE(cGrad.style(), conicalBrush.style());
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
         QCOMPARE(cGrad.matrix(), conicalBrush.matrix());
+QT_WARNING_POP
         QCOMPARE(cGrad.gradient()->type(), conicalBrush.gradient()->type());
         QCOMPARE(cGrad.gradient()->stops(), conicalBrush.gradient()->stops());
         QCOMPARE(cGrad.gradient()->spread(), conicalBrush.gradient()->spread());