From a3cb057c3d5c9ed2c12fb7542065c3d667be38b7 Mon Sep 17 00:00:00 2001
From: Alexander Volkov <a.volkov@rusbitech.ru>
Date: Mon, 22 Sep 2014 12:35:22 +0400
Subject: [PATCH] Doc: Don't show a description for omitted
SH_ComboBox_UseNativePopup enum item
\omitvalue does not allow a description of an enum item, so move
the description as a comment to the enum declaration.
Change-Id: I4192b16e41b704cbad66c0eeafcb141087d2ba65
Reviewed-by: Martin Smith <martin.smith@digia.com>
---
src/widgets/styles/qstyle.cpp | 3 +--
src/widgets/styles/qstyle.h | 2 ++
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp
index 4c5c7cd17e6..c4854f29254 100644
--- a/src/widgets/styles/qstyle.cpp
+++ b/src/widgets/styles/qstyle.cpp
@@ -1750,8 +1750,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
\value SH_ComboBox_Popup Allows popups as a combobox drop-down
menu.
- \omitvalue SH_ComboBox_UseNativePopup Whether we should use a native popup.
- Only supported for non-editable combo boxes on Mac OS X so far.
+ \omitvalue SH_ComboBox_UseNativePopup
\value SH_Workspace_FillSpaceOnMaximize The workspace should
maximize the client area.
diff --git a/src/widgets/styles/qstyle.h b/src/widgets/styles/qstyle.h
index 136daa9abdf..9c9493041f3 100644
--- a/src/widgets/styles/qstyle.h
+++ b/src/widgets/styles/qstyle.h
@@ -702,6 +702,8 @@ public:
SH_ToolTip_FallAsleepDelay,
SH_Widget_Animate,
SH_Splitter_OpaqueResize,
+ // Whether we should use a native popup.
+ // Only supported for non-editable combo boxes on Mac OS X so far.
SH_ComboBox_UseNativePopup,
// Add new style hint values here
--
GitLab