summaryrefslogtreecommitdiffstats
path: root/src/gui/styles/qs60style.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-31 10:47:33 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-31 10:47:33 (GMT)
commitb85a41ece042bca5c4e1ac2a6549f2cdc2c6ca1a (patch)
treeedbdf52864f6e430aabc876316c9f29fdc66c019 /src/gui/styles/qs60style.cpp
parentedd41ee5488716cf8336a7d8ea0cb3d48d0e7b14 (diff)
parent93135ba7f52e0ccbbcd8bda390a69d089da62b83 (diff)
downloadQt-b85a41ece042bca5c4e1ac2a6549f2cdc2c6ca1a.zip
Qt-b85a41ece042bca5c4e1ac2a6549f2cdc2c6ca1a.tar.gz
Qt-b85a41ece042bca5c4e1ac2a6549f2cdc2c6ca1a.tar.bz2
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Revert 4.6 commits that shouldn't be in 4.7. Revert "Add a children private property needed for QML to support QGraphicsObject" Revert "struct -> class, it's better." Revert "Add NOTIFY to size property so QML bindings are working fine." Revert "Better handling for NOTIFY in QGraphicsWidget regarding geometry changes" Revert "Add a a layout property in QGraphicsWidget." Add a workaround for a bug in Mac filesystem watcher. Another "off by 1" problem in OpenVG - in paths this time. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ecfa4583e573ce4dff1f0df12f6bdba3022376e5 ) Doc: Added links and notes to modules, ActiveQt and XMLPatterns docs. do not detect the echo-without-newline syntax over and over speed up by removing nonsense no need for CONFIG += ordered here Autotest: don't allow choosing between debug/release mode. QS60Style: Custom QPushButton: Heigth is calculated wrongly Added additional logging to Phonon MMF backend Compile on MingW struct -> class, it's better. Add a a layout property in QGraphicsWidget. Fix QFileSystemModel to not install useless watchers on the filesystem
Diffstat (limited to 'src/gui/styles/qs60style.cpp')
-rw-r--r--src/gui/styles/qs60style.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index 000696c..f49acc4 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;