From 80083187af81316d436483e5fc39cfddccc821cc Mon Sep 17 00:00:00 2001
From: Guoqing Zhang <guoqing.zhang@nokia.com>
Date: Tue, 12 Apr 2011 10:59:43 +0300
Subject: Add focus frame support in style sheet

Task-number: QTBUG-16207
Reviewed-by: Sami Merila
---
 src/gui/styles/qstylesheetstyle.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp
index 6a0bf5e..369a0f0 100644
--- a/src/gui/styles/qstylesheetstyle.cpp
+++ b/src/gui/styles/qstylesheetstyle.cpp
@@ -3340,9 +3340,11 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
         break;
 
     case CE_FocusFrame:
-        if (rule.hasBorder())
+        if (!rule.hasNativeBorder()) {
             rule.drawBorder(p, opt->rect);
-        return;
+            return;
+        }
+        break;
 
     case CE_PushButton:
         if (const QStyleOptionButton *btn = qstyleoption_cast<const QStyleOptionButton *>(opt)) {
-- 
cgit v0.12