diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-11 09:13:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-11 09:13:21 +0100 |
| commit | 8dd22d9255287bad17823d8738ac05dbffca33ab (patch) | |
| tree | 94cc700070d567960260171e7edfad9d587d1b6e /src/widgets/styles/qcommonstyle.cpp | |
| parent | 7a342372bb1ecbe4146811cff48ede974c7761b5 (diff) | |
| parent | 9b800b55c1c4f2b3e6ed365736e357eb31423c95 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ia443f6eb1c854c99c68127a376b78c1986675a9d
Diffstat (limited to 'src/widgets/styles/qcommonstyle.cpp')
| -rw-r--r-- | src/widgets/styles/qcommonstyle.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index 95b4e3b2c6..14a18a13e9 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -5301,6 +5301,9 @@ int QCommonStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget case SH_ComboBox_AllowWheelScrolling: ret = true; break; + case SH_SpinBox_ButtonsInsideFrame: + ret = true; + break; default: ret = 0; break; |