1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_QDataStream::readQCursor(): Replace deprecated QCursor API

Browse Source 
Task-number: QTBUG-48701
Change-Id: I4205d278b1cd6b088f8f58020f6a5e49a7f1ca33
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Sze Howe Koh 2020-01-26 16:27:09 +08:00
parent aec3c6a9cb
commit e6f479a830
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp
View File

@ -1170,18 +1170,18 @@ void tst_QDataStream::readQCursor(QDataStream *s)
QVERIFY(d5.shape() == test.shape()); //## lacks operator== QVERIFY(d5.shape() == test.shape()); //## lacks operator==
QCOMPARE(d5.hotSpot(), test.hotSpot()); QCOMPARE(d5.hotSpot(), test.hotSpot());
QVERIFY((d5.bitmap() != 0 && test.bitmap() != 0) || (d5.bitmap() == 0 && test.bitmap() == 0));
if (d5.bitmap() != 0) { // Comparing non-null QBitmaps will fail. Upcast them first to pass.
QPixmap actual = *(d5.bitmap()); QCOMPARE(d5.bitmap(Qt::ReturnByValue).isNull(), test.bitmap(Qt::ReturnByValue).isNull());
QPixmap expected = *(test.bitmap()); QCOMPARE(
QCOMPARE(actual, expected); static_cast<QPixmap>(d5.bitmap(Qt::ReturnByValue)),
} static_cast<QPixmap>(test.bitmap(Qt::ReturnByValue))
QVERIFY((d5.mask() != 0 && test.mask() != 0) || (d5.mask() == 0 && test.mask() == 0)); );
if (d5.mask() != 0) { QCOMPARE(d5.mask(Qt::ReturnByValue).isNull(), test.mask(Qt::ReturnByValue).isNull());
QPixmap actual = *(d5.mask()); QCOMPARE(
QPixmap expected = *(test.mask()); static_cast<QPixmap>(d5.mask(Qt::ReturnByValue)),
QCOMPARE(actual, expected); static_cast<QPixmap>(test.mask(Qt::ReturnByValue))
} );
} }
#endif #endif