summaryrefslogtreecommitdiffstats
path: root/src/gui/itemviews
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>2009-11-09 11:38:17 (GMT)
committerMarius Storm-Olsen <marius.storm-olsen@nokia.com>2009-11-09 11:38:17 (GMT)
commite9a06e6f9765c9632103c86fe190e8154ce4a9f8 (patch)
treecc9fc9c931423674081b6ab843d22bc643a5df64 /src/gui/itemviews
parent00aeefeeaff4d8c3e25c6f388c5e51c239541f87 (diff)
parenta2a3adf7de2ffc9784fea177a43f3124862a992a (diff)
downloadQt-e9a06e6f9765c9632103c86fe190e8154ce4a9f8.zip
Qt-e9a06e6f9765c9632103c86fe190e8154ce4a9f8.tar.gz
Qt-e9a06e6f9765c9632103c86fe190e8154ce4a9f8.tar.bz2
Merge branch '4.6-api-review' into 4.6
Diffstat (limited to 'src/gui/itemviews')
-rw-r--r--src/gui/itemviews/qitemdelegate.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/itemviews/qitemdelegate.cpp b/src/gui/itemviews/qitemdelegate.cpp
index 3b3036d..3e00dba 100644
--- a/src/gui/itemviews/qitemdelegate.cpp
+++ b/src/gui/itemviews/qitemdelegate.cpp
@@ -1059,7 +1059,7 @@ QPixmap *QItemDelegate::selected(const QPixmap &pixmap, const QPalette &palette,
painter.end();
QPixmap selected = QPixmap(QPixmap::fromImage(img));
- int n = (img.numBytes() >> 10) + 1;
+ int n = (img.byteCount() >> 10) + 1;
if (QPixmapCache::cacheLimit() < n)
QPixmapCache::setCacheLimit(n);