diff options
| author | Sami Merila <sami.merila@nokia.com> | 2009-12-16 10:21:14 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2009-12-16 10:21:14 (GMT) |
| commit | 989895e84806b88f0b1e0d75ce6dbf6c482357b6 (patch) | |
| tree | 95066131a2356d68479d2a4ad9fe719edf49e2fa /src/gui/itemviews/qitemdelegate.cpp | |
| parent | a43868ca114562502618b4e9c3dd096c65c2e192 (diff) | |
| parent | 6e527912d719b0448b91eba1d6a99b9cbe58170a (diff) | |
| download | Qt-989895e84806b88f0b1e0d75ce6dbf6c482357b6.zip Qt-989895e84806b88f0b1e0d75ce6dbf6c482357b6.tar.gz Qt-989895e84806b88f0b1e0d75ce6dbf6c482357b6.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'src/gui/itemviews/qitemdelegate.cpp')
| -rw-r--r-- | src/gui/itemviews/qitemdelegate.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/itemviews/qitemdelegate.cpp b/src/gui/itemviews/qitemdelegate.cpp index 871a4b1..3e00dba 100644 --- a/src/gui/itemviews/qitemdelegate.cpp +++ b/src/gui/itemviews/qitemdelegate.cpp @@ -255,7 +255,7 @@ QSizeF QItemDelegatePrivate::doTextLayout(int lineWidth) const \row \o \l Qt::BackgroundRole \o QBrush \row \o \l Qt::BackgroundColorRole \o QColor (obsolete; use Qt::BackgroundRole instead) \row \o \l Qt::CheckStateRole \o Qt::CheckState - \row \o \l Qt::DecorationRole \o QIcon and QColor + \row \o \l Qt::DecorationRole \o QIcon, QPixmap and QColor \row \o \l Qt::DisplayRole \o QString and types with a string representation \row \o \l Qt::EditRole \o See QItemEditorFactory for details \row \o \l Qt::FontRole \o QFont @@ -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); |