diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-04 10:36:43 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-04 10:36:43 (GMT) |
| commit | 1d7d827eca37bafe5bfff5ab6bad0056beac9d5d (patch) | |
| tree | 4c99b10b17f2e19245ae122886b2c90aab37e5a3 | |
| parent | 296f64a839a6af458a98d36da4836cab1d5cbb8e (diff) | |
| parent | 685d89b68dd11263d53a2c0982f057965f7262f2 (diff) | |
| download | Qt-1d7d827eca37bafe5bfff5ab6bad0056beac9d5d.zip Qt-1d7d827eca37bafe5bfff5ab6bad0056beac9d5d.tar.gz Qt-1d7d827eca37bafe5bfff5ab6bad0056beac9d5d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Regression: QS60Style - All standardIcons are drawn as "small icons"
| -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 1b84aba..fc5589c 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -3810,7 +3810,7 @@ QIcon QS60Style::standardIconImplementation(StandardPixmap standardIcon, #if defined(Q_WS_S60) //If new custom standardIcon is missing version information, assume S60 5.3. - if (standardIcon >= SP_CustomToolBarAdd) { + if (standardIcon & QStyle::SP_CustomBase) { if (versionSupport == QSysInfo::SV_Unknown) versionSupport = QSysInfo::SV_S60_5_3; metric = PM_SmallIconSize; |