diff options
| author | Sami Merila <sami.merila@nokia.com> | 2011-04-12 08:20:06 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2011-04-12 08:20:06 (GMT) |
| commit | 7be267636b69222b18326919b7838c49e502033a (patch) | |
| tree | b33ed7e8414cf54b1c9b88f131cdf527638da814 /src | |
| parent | cd19ab9f306f777b495cceabaf57a6eeaf86a82a (diff) | |
| parent | 80083187af81316d436483e5fc39cfddccc821cc (diff) | |
| download | Qt-7be267636b69222b18326919b7838c49e502033a.zip Qt-7be267636b69222b18326919b7838c49e502033a.tar.gz Qt-7be267636b69222b18326919b7838c49e502033a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/styles/qstylesheetstyle.cpp | 6 |
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)) { |