diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-10-28 18:21:29 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-10-28 18:21:45 +0100 |
| commit | 8613b64f535b0ce05adf6f4708ba0826f22a7eb4 (patch) | |
| tree | 101d18856ef81169df0da8a0e7afb846e5579a62 /src/widgets/styles | |
| parent | d6c1a9cb267cc5ffec2e55bc9990ced43c19b73a (diff) | |
| parent | a3cb057c3d5c9ed2c12fb7542065c3d667be38b7 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Change-Id: I224e44a9df314b9a99d33148b6cf400fcbc9de8e
Diffstat (limited to 'src/widgets/styles')
| -rw-r--r-- | src/widgets/styles/qstyle.cpp | 3 | ||||
| -rw-r--r-- | 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 6cf61a691e..856ec271fb 100644 --- a/src/widgets/styles/qstyle.cpp +++ b/src/widgets/styles/qstyle.cpp @@ -1746,8 +1746,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 681f3e0468..43a49e3746 100644 --- a/src/widgets/styles/qstyle.h +++ b/src/widgets/styles/qstyle.h @@ -698,6 +698,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, SH_LineEdit_PasswordMaskDelay, SH_TabBar_ChangeCurrentDelay, |