diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-12 17:56:45 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-12 17:56:45 (GMT) |
| commit | 22796b38c3a7dbcdb540e4c58e645b0267fe360c (patch) | |
| tree | dab9604e944d0184249ac2dceca7b6b16adba39e /src/gui/styles | |
| parent | b958102dfa36a3554911adb8fdb21375f0ecb48c (diff) | |
| parent | bf71ab63e805e49e59fbe25265104a414ab7d039 (diff) | |
| download | Qt-22796b38c3a7dbcdb540e4c58e645b0267fe360c.zip Qt-22796b38c3a7dbcdb540e4c58e645b0267fe360c.tar.gz Qt-22796b38c3a7dbcdb540e4c58e645b0267fe360c.tar.bz2 | |
Merge branch '4.6'
Diffstat (limited to 'src/gui/styles')
| -rw-r--r-- | src/gui/styles/qs60style.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index bcc993a..d78ea21 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -1363,7 +1363,7 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option, } } - int rightValue = widget ? widget->contentsRect().right() : 0; + int rightValue = widget ? widget->contentsRect().right() : voptAdj.rect.right(); if (isScrollBarVisible) rightValue -= scrollBarWidth; |