diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-12 06:27:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-12 06:27:32 (GMT) |
| commit | bf71ab63e805e49e59fbe25265104a414ab7d039 (patch) | |
| tree | cff344aadda212ade460dd3a093333d0362b8f90 /src/gui/styles | |
| parent | 6900cf8d7cb8d1e98f3af2ac7ce909dc3b5fc2ef (diff) | |
| parent | bf39fbe3ffcde6d55e508145c1f727cd4815d330 (diff) | |
| download | Qt-bf71ab63e805e49e59fbe25265104a414ab7d039.zip Qt-bf71ab63e805e49e59fbe25265104a414ab7d039.tar.gz Qt-bf71ab63e805e49e59fbe25265104a414ab7d039.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix for QTBUG-7267 Qs60Style::drawControl() does not align CE_ItemViewItem
Fix for QTBUG-6408 QFontEngineS60::QFontEngineS60 called hundreds of
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; |