diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-30 20:07:16 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-30 20:07:16 +0200 |
| commit | 1ba55cad79980b56654403153d6d228800242774 (patch) | |
| tree | f9b0afa840818e78f6c9fbb830d017d8aa75f6df /src | |
| parent | a32aedc044948965d91a21b9731d3c70a7dfb45c (diff) | |
| parent | 601b68cbff1d0fc3f718d658384e75fce189381a (diff) | |
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:
QS60Style: Custom QPushButton: Heigth is calculated wrongly
Diffstat (limited to 'src')
| -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 000696c225..f49acc453b 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -2433,7 +2433,7 @@ QSize QS60Style::sizeFromContents(ContentsType ct, const QStyleOption *opt, const int contentHeight = qMax(qMax(iconHeight, decoratorHeight) + pixelMetric(PM_ButtonMargin), textHeight + 2*pixelMetric(PM_ButtonMargin)); - sz.setHeight(contentHeight); + sz.setHeight(qMax(sz.height(), contentHeight)); sz += QSize(2 * pixelMetric(PM_ButtonMargin), 0); } break; |