diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-07-02 10:04:04 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-07-02 10:04:04 (GMT) |
commit | f4f79c42b7086145b59e99d195b6295720b7377a (patch) | |
tree | 9b34b9e242062d6833f9d3c9353ca1e252f76a86 /src/gui/itemviews | |
parent | c1283842567eea7dd83147a4bea5cd01564fdc2b (diff) | |
parent | 353dacb5e4c45e860ae8be228df9647c5a71093e (diff) | |
download | Qt-f4f79c42b7086145b59e99d195b6295720b7377a.zip Qt-f4f79c42b7086145b59e99d195b6295720b7377a.tar.gz Qt-f4f79c42b7086145b59e99d195b6295720b7377a.tar.bz2 |
Merge branch '4.5'
Diffstat (limited to 'src/gui/itemviews')
-rw-r--r-- | src/gui/itemviews/qitemdelegate.cpp | 2 | ||||
-rw-r--r-- | src/gui/itemviews/qstyleditemdelegate.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/itemviews/qitemdelegate.cpp b/src/gui/itemviews/qitemdelegate.cpp index 264fa37..2dd5540 100644 --- a/src/gui/itemviews/qitemdelegate.cpp +++ b/src/gui/itemviews/qitemdelegate.cpp @@ -574,7 +574,7 @@ void QItemDelegate::setEditorData(QWidget *editor, const QModelIndex &index) con } /*! - Gets data drom the \a editor widget and stores it in the specified + Gets data from the \a editor widget and stores it in the specified \a model at the item \a index. The default implementation gets the value to be stored in the data diff --git a/src/gui/itemviews/qstyleditemdelegate.cpp b/src/gui/itemviews/qstyleditemdelegate.cpp index e528e58..edca724 100644 --- a/src/gui/itemviews/qstyleditemdelegate.cpp +++ b/src/gui/itemviews/qstyleditemdelegate.cpp @@ -508,7 +508,7 @@ void QStyledItemDelegate::setEditorData(QWidget *editor, const QModelIndex &inde } /*! - Gets data drom the \a editor widget and stores it in the specified + Gets data from the \a editor widget and stores it in the specified \a model at the item \a index. The default implementation gets the value to be stored in the data |