diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-15 04:00:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-15 04:00:02 (GMT) |
| commit | 34761e25b13bb2af27e9701a04ce0bf31d84c489 (patch) | |
| tree | 8287d90d38ecf887cfe1eca798acb56619e17820 | |
| parent | de20fdfb1da72d2ad89689f46f8412c04c25fc96 (diff) | |
| parent | 995afbfc2ca81960ca840f50b2a837938a4f1d52 (diff) | |
| download | Qt-34761e25b13bb2af27e9701a04ce0bf31d84c489.zip Qt-34761e25b13bb2af27e9701a04ce0bf31d84c489.tar.gz Qt-34761e25b13bb2af27e9701a04ce0bf31d84c489.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:
Change a name of a variable to be more descriptive
| -rw-r--r-- | src/gui/styles/qs60style.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 9025e5b..14e9b95 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -2559,11 +2559,11 @@ QRect QS60Style::subControlRect(ComplexControl control, const QStyleOptionComple if (const QStyleOptionSpinBox *spinbox = qstyleoption_cast<const QStyleOptionSpinBox *>(option)) { const int frameThickness = spinbox->frame ? pixelMetric(PM_SpinBoxFrameWidth, spinbox, widget) : 0; const int buttonMargin = spinbox->frame ? 2 : 0; - const int buttonWidth = QS60StylePrivate::pixelMetric(PM_ButtonIconSize) + 2 * buttonMargin; + const int buttonContentWidth = QS60StylePrivate::pixelMetric(PM_ButtonIconSize) + 2 * buttonMargin; QSize buttonSize; buttonSize.setHeight(qMax(8, spinbox->rect.height() - frameThickness)); //width should at least be equal to height - buttonSize.setWidth(qMax(buttonSize.height(), buttonWidth)); + buttonSize.setWidth(qMax(buttonSize.height(), buttonContentWidth)); buttonSize = buttonSize.expandedTo(QApplication::globalStrut()); const int y = frameThickness + spinbox->rect.y(); |