From 0318f0d5a43a78831f3bf4cb043d0b2b41cd9987 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Wed, 28 Jul 2010 16:53:14 +0200
Subject: 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
---
 src/gui/styles/qstylesheetstyle.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

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
-- 
cgit v0.12