From b5bbfad0a4e11a5db7ed04caf4dba43bcee7ae8d Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Mon, 22 Sep 2014 13:03:21 +0400 Subject: Doc: Fix obsoleteness of some QStyle::PixelMetric enum items The enum items PM_ScrollView_ScrollBarSpacing, PM_ScrollView_ScrollBarOverlap and PM_SubMenuOverlap were mistakenly put together with obsolete enum items. Move them up to fix it. Change-Id: I90bd3a8ab68c99db27134d976fe69df56c9af2b8 Reviewed-by: Sean Harmer Reviewed-by: Martin Smith --- src/widgets/styles/qstyle.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/widgets') diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp index 52a794a03a..6cf61a691e 100644 --- a/src/widgets/styles/qstyle.cpp +++ b/src/widgets/styles/qstyle.cpp @@ -1463,6 +1463,12 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, \value PM_TabCloseIndicatorWidth The default width of a close button on a tab in a tab bar. \value PM_TabCloseIndicatorHeight The default height of a close button on a tab in a tab bar. + \value PM_ScrollView_ScrollBarSpacing Distance between frame and scrollbar + with SH_ScrollView_FrameOnlyAroundContents set. + \value PM_ScrollView_ScrollBarOverlap Overlap between scroll bars and scroll content + + \value PM_SubMenuOverlap The horizontal overlap between a submenu and its parent. + \value PM_TreeViewIndentation The indentation of items in a tree view. This enum value has been introduced in Qt 5.4. @@ -1483,12 +1489,6 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, and PM_LayoutVerticalSpacing instead. - \value PM_ScrollView_ScrollBarSpacing Distance between frame and scrollbar - with SH_ScrollView_FrameOnlyAroundContents set. - \value PM_ScrollView_ScrollBarOverlap Overlap between scroll bars and scroll content - - \value PM_SubMenuOverlap The horizontal overlap between a submenu and its parent. - \sa pixelMetric() */ -- cgit v1.2.3