summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuoqing Zhang <guoqing.zhang@nokia.com>2011-04-12 07:59:43 (GMT)
committerGuoqing Zhang <guoqing.zhang@nokia.com>2011-04-12 07:59:43 (GMT)
commit80083187af81316d436483e5fc39cfddccc821cc (patch)
tree8aa0ba1455ad1907372ccfc8c7572551a4377c46 /src
parent0f7a4790bb0e3435a02f8751a29dc06c1f88d8d5 (diff)
downloadQt-80083187af81316d436483e5fc39cfddccc821cc.zip
Qt-80083187af81316d436483e5fc39cfddccc821cc.tar.gz
Qt-80083187af81316d436483e5fc39cfddccc821cc.tar.bz2
Add focus frame support in style sheet
Task-number: QTBUG-16207 Reviewed-by: Sami Merila
Diffstat (limited to 'src')
-rw-r--r--src/gui/styles/qstylesheetstyle.cpp6
1 files 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)) {