diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-08-26 11:37:18 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-08-26 11:37:18 (GMT) |
| commit | 55123a9b94eb38a372a2d285b25c58085921f233 (patch) | |
| tree | a50e58817060bd31116e4cee684300eaf721ce4f /src/gui/styles | |
| parent | c0c2e556e98ffe550cbedb4e3a0def5dd272ce25 (diff) | |
| parent | a4515ec14fdc772eb6b5c4801cddaddc26b94d84 (diff) | |
| download | Qt-55123a9b94eb38a372a2d285b25c58085921f233.zip Qt-55123a9b94eb38a372a2d285b25c58085921f233.tar.gz Qt-55123a9b94eb38a372a2d285b25c58085921f233.tar.bz2 | |
Merge remote branch 'qt/master' into lighthouse-master
Conflicts:
src/opengl/opengl.pro
src/opengl/qgl.cpp
src/opengl/qgl_p.h
Diffstat (limited to 'src/gui/styles')
| -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 7351a7d..4be439d 100644 --- a/src/gui/styles/qstylesheetstyle.cpp +++ b/src/gui/styles/qstylesheetstyle.cpp @@ -3048,6 +3048,13 @@ void QStyleSheetStyle::drawComplexControl(ComplexControl cc, const QStyleOptionC titleRule.configurePalette(&pal, QPalette::WindowText, QPalette::Window); drawItemText(p, labelRect, alignment, pal, gb->state & State_Enabled, gb->text, QPalette::WindowText); + + if (gb->state & State_HasFocus) { + QStyleOptionFocusRect fropt; + fropt.QStyleOption::operator=(*gb); + fropt.rect = labelRect; + drawPrimitive(PE_FrameFocusRect, &fropt, p, w); + } } return; |