diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-17 17:19:24 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-27 12:21:29 +0200 |
| commit | dccf28b7c344822b7459635099ebe3abdf5fd107 (patch) | |
| tree | 3acab7b16c02f87ace113cc2f0cc8d9598e219e4 /tests/auto/gui/itemmodels | |
| parent | 4ba25a092065a6422510a9f4afa4fbbabeda686c (diff) | |
Remove deprecated members from several QtGui classes
Those can be trivially removed as they have direct replacements, or
are completely unused.
The migration path for QCursor::bitmap and QCursor::mask is
QBitmap *pb = c.bitmap(); // up to 5.15, warns in 5.15
QBitmap vb = c.bitmap(Qt::ReturnByValue); // from 5.15, works in 6
QBitmap b = c.bitmap(); // from 6.0 on
Change-Id: I3b3acd1c7f09c4c8414e98b3ce11986f1ecd5eda
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests/auto/gui/itemmodels')
| -rw-r--r-- | tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp b/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp index 596908d84d..9b98ad04e9 100644 --- a/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp +++ b/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp @@ -308,18 +308,6 @@ void tst_QStandardItem::getSetFlags() item.setCheckState(Qt::Checked); item.setCheckable(true); QCOMPARE(item.checkState(), Qt::Checked); - -#if QT_DEPRECATED_SINCE(5, 6) -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - // deprecated API - item.setTristate(true); - QVERIFY(item.isTristate()); - QVERIFY(item.flags() & Qt::ItemIsTristate); - item.setTristate(false); - QVERIFY(!(item.flags() & Qt::ItemIsTristate)); -QT_WARNING_POP -#endif } void tst_QStandardItem::getSetRowAndColumnCount() |