summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-05-20 07:49:14 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-05-20 07:49:14 (GMT)
commitd5348b5fc3a6efe13fd1dbe585b28addfa4344b3 (patch)
tree0bc8b6acd3bcdc4c5c4ef5548ff69b7aed1c9df9 /src
parent023d03ca888cf0e335bcbd413ea57db92e2e2ab5 (diff)
parent23a0475c4676797de987c7a1e11e9593f57631a8 (diff)
downloadQt-d5348b5fc3a6efe13fd1dbe585b28addfa4344b3.zip
Qt-d5348b5fc3a6efe13fd1dbe585b28addfa4344b3.tar.gz
Qt-d5348b5fc3a6efe13fd1dbe585b28addfa4344b3.tar.bz2
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src')
-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 bf9b5c5..3b7eb2d 100644
--- a/src/gui/itemviews/qitemdelegate.cpp
+++ b/src/gui/itemviews/qitemdelegate.cpp
@@ -218,7 +218,7 @@ QSizeF QItemDelegatePrivate::doTextLayout(int lineWidth) const
editor widget, which is a widget that is placed on top of the view
while editing takes place. Editors are created with a
QItemEditorFactory; a default static instance provided by
- QItemEditorFactory is installed on all item delagates. You can set
+ QItemEditorFactory is installed on all item delegates. You can set
a custom factory using setItemEditorFactory() or set a new default
factory with QItemEditorFactory::setDefaultFactory(). It is the
data stored in the item model with the Qt::EditRole that is edited.