summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@nokia.com>2011-03-28 08:07:28 (GMT)
committerMartin Smith <martin.smith@nokia.com>2011-03-28 08:07:28 (GMT)
commit3b05c91ab8876ab64855900bb5a8cf38f91b69f3 (patch)
tree1693cdae89934336b779f3f016814e1356580959 /src
parent921896ab2b5f2ad6be547fbac532914c8f35c80b (diff)
parent0a82c053d6517f85d11b17d84237f8e553599850 (diff)
downloadQt-3b05c91ab8876ab64855900bb5a8cf38f91b69f3.zip
Qt-3b05c91ab8876ab64855900bb5a8cf38f91b69f3.tar.gz
Qt-3b05c91ab8876ab64855900bb5a8cf38f91b69f3.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src')
-rw-r--r--src/gui/itemviews/qstyleditemdelegate.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/itemviews/qstyleditemdelegate.cpp b/src/gui/itemviews/qstyleditemdelegate.cpp
index 0d1473d..eb54bac 100644
--- a/src/gui/itemviews/qstyleditemdelegate.cpp
+++ b/src/gui/itemviews/qstyleditemdelegate.cpp
@@ -263,6 +263,11 @@ QStyledItemDelegate::~QStyledItemDelegate()
The default implementation uses the QLocale::toString to convert \a value into
a QString.
+
+ This function is not called for empty model indices, i.e., indices for which
+ the model returns an invalid QVariant.
+
+ \sa QAbstractItemModel::data()
*/
QString QStyledItemDelegate::displayText(const QVariant &value, const QLocale& locale) const
{