diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-04 18:03:02 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-04 18:03:02 +0200 |
| commit | b036e0c3b7c7094c666367000ca05047fc5d1003 (patch) | |
| tree | 98f56e4def11e11cc52d524cdf7dad4e23dc86e3 /src/qt3support | |
| parent | ffa103af9620998f47c632f4118e789bf7f1cde7 (diff) | |
| parent | c85d2aa7e8d095221e1cc2b4aac2dcd4e9dee775 (diff) | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
translations/translations.pri
Diffstat (limited to 'src/qt3support')
| -rw-r--r-- | src/qt3support/widgets/q3spinwidget.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/qt3support/widgets/q3spinwidget.cpp b/src/qt3support/widgets/q3spinwidget.cpp index 3dc36c5b81..3bfad069b6 100644 --- a/src/qt3support/widgets/q3spinwidget.cpp +++ b/src/qt3support/widgets/q3spinwidget.cpp @@ -340,11 +340,13 @@ void Q3SpinWidget::paintEvent(QPaintEvent *) QPainter p(this); QStyleOptionSpinBox opt = getStyleOption(this); - if (d->theButton & 1) + if (d->theButton & 1) { opt.activeSubControls = QStyle::SC_SpinBoxDown; - else if (d->theButton & 2) + opt.state |= QStyle::State_Sunken; + } else if (d->theButton & 2) { opt.activeSubControls = QStyle::SC_SpinBoxUp; - else + opt.state |= QStyle::State_Sunken; + } else opt.activeSubControls = QStyle::SC_None; opt.rect = style()->subControlRect(QStyle::CC_SpinBox, &opt, QStyle::SC_SpinBoxFrame, this); opt.subControls = QStyle::SC_All; |