diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-20 20:10:21 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-20 20:10:21 (GMT) |
commit | 9306ef3cdbaac0af0f3c0ad1209eb0ba935652df (patch) | |
tree | 77fff05572b47dcd60f183e47c412524e495a507 /src/gui/styles | |
parent | f3e6effc3cea788c7fcf34fad33d58b1a19017f0 (diff) | |
parent | 912e8a2c90a200300feaef18beedd4e6af3e8623 (diff) | |
download | Qt-9306ef3cdbaac0af0f3c0ad1209eb0ba935652df.zip Qt-9306ef3cdbaac0af0f3c0ad1209eb0ba935652df.tar.gz Qt-9306ef3cdbaac0af0f3c0ad1209eb0ba935652df.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Draw focusrect through style proxy
Diffstat (limited to 'src/gui/styles')
-rw-r--r-- | src/gui/styles/qcommonstyle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp index 039a6da..296455b 100644 --- a/src/gui/styles/qcommonstyle.cpp +++ b/src/gui/styles/qcommonstyle.cpp @@ -2217,7 +2217,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, if (vopt->state & QStyle::State_HasFocus) { QStyleOptionFocusRect o; o.QStyleOption::operator=(*vopt); - o.rect = subElementRect(SE_ItemViewItemFocusRect, vopt, widget); + o.rect = proxy()->subElementRect(SE_ItemViewItemFocusRect, vopt, widget); o.state |= QStyle::State_KeyboardFocusChange; o.state |= QStyle::State_Item; QPalette::ColorGroup cg = (vopt->state & QStyle::State_Enabled) |