diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-04 07:36:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-04 07:36:05 (GMT) |
| commit | 6c8acf656a9293db2fdbad569bb1fa3a83975462 (patch) | |
| tree | bb4ccf9e5bdae95d4bda7947422ba1af2c5fff4e /src | |
| parent | 5f84cf294be7670c9312e3581350d5444fa37cb2 (diff) | |
| parent | 81f9fec83bc425d190a3159f9a7ab2672e094cb2 (diff) | |
| download | Qt-6c8acf656a9293db2fdbad569bb1fa3a83975462.zip Qt-6c8acf656a9293db2fdbad569bb1fa3a83975462.tar.gz Qt-6c8acf656a9293db2fdbad569bb1fa3a83975462.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:
QS60Style: QTabWidget icon size property doesn't work
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/styles/qs60style.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index c0c1cdd..20297ae 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -1667,9 +1667,10 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option, alignment |= Qt::TextHideMnemonic; if (!optionTab.icon.isNull()) { QSize iconSize = optionTab.iconSize; - int iconExtent = pixelMetric(PM_TabBarIconSize); - if (iconSize.height() > iconExtent || iconSize.width() > iconExtent) + if (!iconSize.isValid()) { + const int iconExtent = pixelMetric(PM_TabBarIconSize); iconSize = QSize(iconExtent, iconExtent); + } QPixmap tabIcon = optionTab.icon.pixmap(iconSize, (optionTab.state & State_Enabled) ? QIcon::Normal : QIcon::Disabled); if (tab->text.isEmpty()) |