diff options
| author | David Faure <faure@kde.org> | 2009-10-27 14:26:11 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-27 14:26:11 (GMT) |
| commit | df26c6e14287f1a02c636c4624c5085fd8271d11 (patch) | |
| tree | 0ed0fc0e172826fc187a8593d2cf79095744b5fb | |
| parent | c79d83b6d661ea49d893b4590480a434d75b19bd (diff) | |
| download | Qt-df26c6e14287f1a02c636c4624c5085fd8271d11.zip Qt-df26c6e14287f1a02c636c4624c5085fd8271d11.tar.gz Qt-df26c6e14287f1a02c636c4624c5085fd8271d11.tar.bz2 | |
Fix incomplete documentation for Qt::DecorationRole
As noticed by Laurent Montel.
Merge-request: 1812
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 2 | ||||
| -rw-r--r-- | src/gui/itemviews/qitemdelegate.cpp | 2 | ||||
| -rw-r--r-- | src/gui/itemviews/qstyleditemdelegate.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index e8d6df0..438678a 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -2509,7 +2509,7 @@ \value DisplayRole The key data to be rendered in the form of text. (QString) \value DecorationRole The data to be rendered as a decoration in the form - of an icon. (QColor) + of an icon. (QColor, QIcon or QPixmap) \value EditRole The data in a form suitable for editing in an editor. (QString) \value ToolTipRole The data displayed in the item's tooltip. (QString) diff --git a/src/gui/itemviews/qitemdelegate.cpp b/src/gui/itemviews/qitemdelegate.cpp index 871a4b1..3b3036d 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 diff --git a/src/gui/itemviews/qstyleditemdelegate.cpp b/src/gui/itemviews/qstyleditemdelegate.cpp index 1c36787..1ca0391 100644 --- a/src/gui/itemviews/qstyleditemdelegate.cpp +++ b/src/gui/itemviews/qstyleditemdelegate.cpp @@ -148,7 +148,7 @@ public: \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, QImage 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 |