From dccf28b7c344822b7459635099ebe3abdf5fd107 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Fri, 17 Apr 2020 17:19:24 +0200 Subject: 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 --- src/gui/itemmodels/qstandarditemmodel.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/gui/itemmodels/qstandarditemmodel.h') diff --git a/src/gui/itemmodels/qstandarditemmodel.h b/src/gui/itemmodels/qstandarditemmodel.h index a66054a04f..405f72d519 100644 --- a/src/gui/itemmodels/qstandarditemmodel.h +++ b/src/gui/itemmodels/qstandarditemmodel.h @@ -171,11 +171,6 @@ public: } void setUserTristate(bool tristate); -#if QT_DEPRECATED_SINCE(5, 6) - QT_DEPRECATED bool isTristate() const { return isAutoTristate(); } - QT_DEPRECATED void setTristate(bool tristate); -#endif - #if QT_CONFIG(draganddrop) inline bool isDragEnabled() const { return (flags() & Qt::ItemIsDragEnabled) != 0; -- cgit v1.2.3