diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2019-10-09 12:40:10 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2019-10-09 19:05:21 +0200 |
commit | 0e12c8b020d8bb54d214ecbab284429cc702e2d0 (patch) | |
tree | e8c39414e073f91c11bd4516ba7998aef07c4eba /src/widgets | |
parent | b5ff4c9f18423964f3973791c67504cba4b78288 (diff) |
Remove deprecated PE_IndicatorViewItemCheck and PE_FrameStatusBar
They have been marked as deprecated since 5.13, and can be removed
from Qt 6 codebase, which silences the respective compiler warnings.
Change-Id: I3443c7bfa8db148b0b48957e2adc5eb131197faf
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/doc/snippets/javastyle.cpp | 2 | ||||
-rw-r--r-- | src/widgets/doc/src/widgets-and-layouts/styles.qdoc | 2 | ||||
-rw-r--r-- | src/widgets/styles/qstyle.cpp | 1 | ||||
-rw-r--r-- | src/widgets/styles/qstyle.h | 6 |
4 files changed, 2 insertions, 9 deletions
diff --git a/src/widgets/doc/snippets/javastyle.cpp b/src/widgets/doc/snippets/javastyle.cpp index 8657d5ed29..de3143f753 100644 --- a/src/widgets/doc/snippets/javastyle.cpp +++ b/src/widgets/doc/snippets/javastyle.cpp @@ -2130,7 +2130,7 @@ void JavaStyle::drawPrimitive(PrimitiveElement element, painter->restore(); break; } - case PE_IndicatorViewItemCheck: { + case PE_IndicatorItemViewItemCheck: { break; } case PE_FrameWindow: { diff --git a/src/widgets/doc/src/widgets-and-layouts/styles.qdoc b/src/widgets/doc/src/widgets-and-layouts/styles.qdoc index 645da5bca2..faaf4e5479 100644 --- a/src/widgets/doc/src/widgets-and-layouts/styles.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/styles.qdoc @@ -1837,7 +1837,7 @@ item views keep the dimensions on individual sections. Also note that the delegates may use the style to paint decorations and frames around items. QItemDelegate, for instance, draws - \c PE_FrameFocusRect and \c PE_IndicatorViewItemCheck. + \c PE_FrameFocusRect and \c PE_IndicatorItemViewItemCheck. \image javastyle/header.png diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp index 6cbed34c3a..ca81be1b2b 100644 --- a/src/widgets/styles/qstyle.cpp +++ b/src/widgets/styles/qstyle.cpp @@ -638,7 +638,6 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, indicator or button bevel. \omitvalue PE_IndicatorViewItemCheck - \value PE_FrameStatusBar Obsolete. Use PE_FrameStatusBarItem instead. \value PE_PanelButtonCommand Button used to initiate an action, for example, a QPushButton. diff --git a/src/widgets/styles/qstyle.h b/src/widgets/styles/qstyle.h index ee234457f5..b51bcbe8d6 100644 --- a/src/widgets/styles/qstyle.h +++ b/src/widgets/styles/qstyle.h @@ -142,9 +142,6 @@ public: PE_FrameLineEdit, PE_FrameMenu, PE_FrameStatusBarItem, -#if QT_DEPRECATED_SINCE(5, 13) // ### Qt 6: remove - PE_FrameStatusBar Q_DECL_ENUMERATOR_DEPRECATED = PE_FrameStatusBarItem, -#endif PE_FrameTabWidget, PE_FrameWindow, PE_FrameButtonBevel, @@ -165,9 +162,6 @@ public: PE_IndicatorBranch, PE_IndicatorButtonDropDown, PE_IndicatorItemViewItemCheck, -#if QT_DEPRECATED_SINCE(5, 13) // ### Qt 6: remove - PE_IndicatorViewItemCheck Q_DECL_ENUMERATOR_DEPRECATED = PE_IndicatorItemViewItemCheck, -#endif PE_IndicatorCheckBox, PE_IndicatorDockWidgetResizeHandle, PE_IndicatorHeaderArrow, |