diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-14 12:45:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-14 12:45:48 (GMT) |
| commit | 8cf08f2640e31615bba0cc61544642855dc1275e (patch) | |
| tree | 7734bbaad929c6d461e0b71f9007a9a41ffe6149 /src/gui/widgets/qabstractscrollarea.cpp | |
| parent | ccd85016aa7d95495ab113bd5cecc62769a5fad4 (diff) | |
| parent | fcd009cd77f95106f4522103bab9aaf86109a17d (diff) | |
| download | Qt-8cf08f2640e31615bba0cc61544642855dc1275e.zip Qt-8cf08f2640e31615bba0cc61544642855dc1275e.tar.gz Qt-8cf08f2640e31615bba0cc61544642855dc1275e.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QAbstractScrollArea StyleSheet: fix drawing of border with SH_ScrollView_FrameOnlyAroundContents
Diffstat (limited to 'src/gui/widgets/qabstractscrollarea.cpp')
| -rw-r--r-- | src/gui/widgets/qabstractscrollarea.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qabstractscrollarea.cpp b/src/gui/widgets/qabstractscrollarea.cpp index 1d496d5..73ec53e 100644 --- a/src/gui/widgets/qabstractscrollarea.cpp +++ b/src/gui/widgets/qabstractscrollarea.cpp @@ -394,7 +394,7 @@ void QAbstractScrollAreaPrivate::layoutChildren() if ((frameStyle != QFrame::NoFrame) && q->style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents, &opt, q)) { controlsRect = widgetRect; - const int extra = q->style()->pixelMetric(QStyle::PM_ScrollView_ScrollBarSpacing); + const int extra = q->style()->pixelMetric(QStyle::PM_ScrollView_ScrollBarSpacing, &opt, q); const QPoint cornerExtra(needv ? extra : 0, needh ? extra : 0); QRect frameRect = widgetRect; frameRect.adjust(0, 0, -cornerOffset.x() - cornerExtra.x(), -cornerOffset.y() - cornerExtra.y()); |