diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-30 08:44:56 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-30 08:44:56 (GMT) |
| commit | 36c82d1a6c6d84b95c65b9df48d38093cadfd94a (patch) | |
| tree | f172db63847b2240f22db5fae4df07a9eab0fa7e /src/gui/styles | |
| parent | 1acc9bcf4c43851af2096539eda88da9ef58bce3 (diff) | |
| parent | b371999d3e9c207047be6afda89d008b6cf04763 (diff) | |
| download | Qt-36c82d1a6c6d84b95c65b9df48d38093cadfd94a.zip Qt-36c82d1a6c6d84b95c65b9df48d38093cadfd94a.tar.gz Qt-36c82d1a6c6d84b95c65b9df48d38093cadfd94a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/gui/styles')
| -rw-r--r-- | src/gui/styles/qstylesheetstyle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp index cc0ce08..a1a98ba 100644 --- a/src/gui/styles/qstylesheetstyle.cpp +++ b/src/gui/styles/qstylesheetstyle.cpp @@ -3169,8 +3169,8 @@ void QStyleSheetStyle::drawComplexControl(ComplexControl cc, const QStyleOptionC if (subRule1.hasDrawable()) { QRect r(gr.topLeft(), slider->orientation == Qt::Horizontal - ? QPoint(hr.x()+hr.width()/2, gr.y()+gr.height()) - : QPoint(gr.x()+gr.width(), hr.y()+hr.height()/2)); + ? QPoint(hr.x()+hr.width()/2, gr.y()+gr.height() - 1) + : QPoint(gr.x()+gr.width() - 1, hr.y()+hr.height()/2)); subRule1.drawRule(p, r); } |