diff options
author | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-05-25 08:03:17 (GMT) |
---|---|---|
committer | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-05-25 08:03:17 (GMT) |
commit | 07cee1caa5238a9c4a132b6e37a0ef82b665c568 (patch) | |
tree | 0c32d805837dc734b813ca76741a744a4c637a2c /src/gui/itemviews/qitemdelegate.cpp | |
parent | b23dc7fb8bc8de6617684249411b5399f1d06631 (diff) | |
parent | 662494c7a20d6612948a672e5e9c87b9173d9560 (diff) | |
download | Qt-07cee1caa5238a9c4a132b6e37a0ef82b665c568.zip Qt-07cee1caa5238a9c4a132b6e37a0ef82b665c568.tar.gz Qt-07cee1caa5238a9c4a132b6e37a0ef82b665c568.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into softkeys
Conflicts:
src/gui/styles/qs60style.cpp
Diffstat (limited to 'src/gui/itemviews/qitemdelegate.cpp')
-rw-r--r-- | src/gui/itemviews/qitemdelegate.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/itemviews/qitemdelegate.cpp b/src/gui/itemviews/qitemdelegate.cpp index 147f523..8469c88 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. |