diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2014-10-18 13:24:33 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-10-18 13:24:33 +0200 |
| commit | 59ebcdc540e8500c61585f474fa00e15798937a3 (patch) | |
| tree | 173dc6e2fa5f3af0ce6d225adb9543fa4bb3f931 /src/widgets/styles/qmacstyle_mac_p_p.h | |
| parent | cb2e65eea29ce0928cd1d93c005f015fb8225560 (diff) | |
| parent | b55a688b61cf8d0705d8024a46e5070f7c1a18df (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
Diffstat (limited to 'src/widgets/styles/qmacstyle_mac_p_p.h')
| -rw-r--r-- | src/widgets/styles/qmacstyle_mac_p_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/widgets/styles/qmacstyle_mac_p_p.h b/src/widgets/styles/qmacstyle_mac_p_p.h index f36ba2c190..080f944ef8 100644 --- a/src/widgets/styles/qmacstyle_mac_p_p.h +++ b/src/widgets/styles/qmacstyle_mac_p_p.h @@ -126,6 +126,7 @@ enum QCocoaWidgetKind { QCocoaCheckBox, QCocoaComboBox, // Editable QComboBox QCocoaPopupButton, // Non-editable QComboBox + QCocoaPullDownButton, // QPushButton with menu QCocoaPushButton, QCocoaRadioButton, QCocoaHorizontalSlider, |