From 4298385ec33d40001af8b2d04e896e6a332d33e8 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Fri, 19 Jun 2020 20:47:29 +0200 Subject: Remove deprecated roles BackgroundColorRole and TextColorRole Change-Id: I2729102d1efa9f3809ec22c29517961800e7dc6d Reviewed-by: Lars Knoll --- src/corelib/global/qnamespace.h | 4 ---- src/widgets/itemviews/qitemdelegate.cpp | 2 -- src/widgets/itemviews/qstyleditemdelegate.cpp | 2 -- 3 files changed, 8 deletions(-) diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 9ac9d7ab34..cb1c08e4fa 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -1496,10 +1496,6 @@ namespace Qt { TextAlignmentRole = 7, BackgroundRole = 8, ForegroundRole = 9, -#if QT_DEPRECATED_SINCE(5, 13) // ### Qt 6: remove me - BackgroundColorRole Q_DECL_ENUMERATOR_DEPRECATED = BackgroundRole, - TextColorRole Q_DECL_ENUMERATOR_DEPRECATED = ForegroundRole, -#endif CheckStateRole = 10, // Accessibility AccessibleTextRole = 11, diff --git a/src/widgets/itemviews/qitemdelegate.cpp b/src/widgets/itemviews/qitemdelegate.cpp index ddcc9a637e..e6a68bcadd 100644 --- a/src/widgets/itemviews/qitemdelegate.cpp +++ b/src/widgets/itemviews/qitemdelegate.cpp @@ -267,7 +267,6 @@ QSizeF QItemDelegatePrivate::doTextLayout(int lineWidth) const \row \li \l Qt::AccessibleTextRole \li QString \endomit \row \li \l Qt::BackgroundRole \li QBrush (\since 4.2) - \row \li \l Qt::BackgroundColorRole \li QColor (obsolete; use Qt::BackgroundRole instead) \row \li \l Qt::CheckStateRole \li Qt::CheckState \row \li \l Qt::DecorationRole \li QIcon, QPixmap and QColor \row \li \l Qt::DisplayRole \li QString and types with a string representation @@ -279,7 +278,6 @@ QSizeF QItemDelegatePrivate::doTextLayout(int lineWidth) const \endomit \row \li \l Qt::TextAlignmentRole \li Qt::Alignment \row \li \l Qt::ForegroundRole \li QBrush (\since 4.2) - \row \li \l Qt::TextColorRole \li QColor (obsolete; use Qt::ForegroundRole instead) \omit \row \li \l Qt::ToolTipRole \row \li \l Qt::WhatsThisRole diff --git a/src/widgets/itemviews/qstyleditemdelegate.cpp b/src/widgets/itemviews/qstyleditemdelegate.cpp index 58f949656b..06cc6fc296 100644 --- a/src/widgets/itemviews/qstyleditemdelegate.cpp +++ b/src/widgets/itemviews/qstyleditemdelegate.cpp @@ -140,7 +140,6 @@ public: \row \li \l Qt::AccessibleTextRole \li QString \endomit \row \li \l Qt::BackgroundRole \li QBrush (\since 4.2) - \row \li \l Qt::BackgroundColorRole \li QColor (obsolete; use Qt::BackgroundRole instead) \row \li \l Qt::CheckStateRole \li Qt::CheckState \row \li \l Qt::DecorationRole \li QIcon, QPixmap, QImage and QColor \row \li \l Qt::DisplayRole \li QString and types with a string representation @@ -152,7 +151,6 @@ public: \endomit \row \li \l Qt::TextAlignmentRole \li Qt::Alignment \row \li \l Qt::ForegroundRole \li QBrush (\since 4.2) - \row \li \l Qt::TextColorRole \li QColor (obsolete; use Qt::ForegroundRole instead) \omit \row \li \l Qt::ToolTipRole \row \li \l Qt::WhatsThisRole -- cgit v1.2.3