summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSami Merila <sami.merila@nokia.com>2011-07-04 10:03:02 (GMT)
committerSami Merila <sami.merila@nokia.com>2011-07-04 10:03:02 (GMT)
commit685d89b68dd11263d53a2c0982f057965f7262f2 (patch)
tree4c99b10b17f2e19245ae122886b2c90aab37e5a3 /src
parent296f64a839a6af458a98d36da4836cab1d5cbb8e (diff)
downloadQt-685d89b68dd11263d53a2c0982f057965f7262f2.zip
Qt-685d89b68dd11263d53a2c0982f057965f7262f2.tar.gz
Qt-685d89b68dd11263d53a2c0982f057965f7262f2.tar.bz2
Regression: QS60Style - All standardIcons are drawn as "small icons"
StandardIcon enum comparison should be done with bitwise operation, not with value. Task-number: QTBUG-20240 Reviewed-by: Tomi Vihria
Diffstat (limited to 'src')
-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 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;