diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-07-28 14:53:14 (GMT) |
|---|---|---|
| committer | Toby Tomkins <toby.tomkins@nokia.com> | 2010-07-29 04:00:58 (GMT) |
| commit | 5c0d4e26cc31d18c8db1f2a01a10a994836101f2 (patch) | |
| tree | 3fac5531c394574f22d66bf0393c8a558d1b2036 /src/gui/styles/qstylesheetstyle.cpp | |
| parent | aa2039086c3c165b8c5655d58f8673536160002d (diff) | |
| download | Qt-5c0d4e26cc31d18c8db1f2a01a10a994836101f2.zip Qt-5c0d4e26cc31d18c8db1f2a01a10a994836101f2.tar.gz Qt-5c0d4e26cc31d18c8db1f2a01a10a994836101f2.tar.bz2 | |
QMenu and QStyleSheetStyle: fix setting a border.
The native border would be drawn over the one drawn by the QStyleSheetStyle
Regression since 68a498284e206e2bb000bc35331c966f3790f607
Reviewed-by: Gabriel
Task-number: QTBUG-10785
(cherry picked from commit 0318f0d5a43a78831f3bf4cb043d0b2b41cd9987)
Diffstat (limited to 'src/gui/styles/qstylesheetstyle.cpp')
| -rw-r--r-- | src/gui/styles/qstylesheetstyle.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp index 43fa4b9..dff525e 100644 --- a/src/gui/styles/qstylesheetstyle.cpp +++ b/src/gui/styles/qstylesheetstyle.cpp @@ -4283,6 +4283,13 @@ void QStyleSheetStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *op } break; + case PE_FrameMenu: + if (rule.hasDrawable()) { + // Drawn by PE_PanelMenu + return; + } + break; + case PE_PanelMenuBar: if (rule.hasDrawable()) { // Drawn by PE_Widget |