diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-11 00:00:11 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-11 00:00:11 (GMT) |
| commit | 9192dbe2781d9891d41c05f52d19b2d94b2b5f94 (patch) | |
| tree | f0b470d53e5fccae99f40d9f60cb43bfb0b29c10 /src/gui/itemviews | |
| parent | f6c23d7874043ca67ae7e8b87d7948e7c710fc53 (diff) | |
| parent | c8a2533cb39ce0c7479880cd889ad594d569ecc0 (diff) | |
| download | Qt-9192dbe2781d9891d41c05f52d19b2d94b2b5f94.zip Qt-9192dbe2781d9891d41c05f52d19b2d94b2b5f94.tar.gz Qt-9192dbe2781d9891d41c05f52d19b2d94b2b5f94.tar.bz2 | |
Merge branch 'master-upstream' into master-water
Diffstat (limited to 'src/gui/itemviews')
| -rw-r--r-- | src/gui/itemviews/qabstractitemview.cpp | 4 | ||||
| -rw-r--r-- | src/gui/itemviews/qstandarditemmodel.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp index f2d8303..f7122d6 100644 --- a/src/gui/itemviews/qabstractitemview.cpp +++ b/src/gui/itemviews/qabstractitemview.cpp @@ -862,7 +862,7 @@ QVariant QAbstractItemView::inputMethodQuery(Qt::InputMethodQuery query) const deleted. QAbstractItemView does not take ownership of \a delegate. \note If a delegate has been assigned to both a row and a column, the row - delegate (i.e., this delegate) will take presedence and manage the + delegate (i.e., this delegate) will take precedence and manage the intersecting cell index. \warning You should not share the same instance of a delegate between views. @@ -920,7 +920,7 @@ QAbstractItemDelegate *QAbstractItemView::itemDelegateForRow(int row) const deleted. QAbstractItemView does not take ownership of \a delegate. \note If a delegate has been assigned to both a row and a column, the row - delegate will take presedence and manage the intersecting cell index. + delegate will take precedence and manage the intersecting cell index. \warning You should not share the same instance of a delegate between views. Doing so can cause incorrect or unintuitive editing behavior since each diff --git a/src/gui/itemviews/qstandarditemmodel.cpp b/src/gui/itemviews/qstandarditemmodel.cpp index 767b5a9..7d20bbb 100644 --- a/src/gui/itemviews/qstandarditemmodel.cpp +++ b/src/gui/itemviews/qstandarditemmodel.cpp @@ -1130,7 +1130,7 @@ Qt::ItemFlags QStandardItem::flags() const meaning that the user can interact with the item; if \a enabled is false, the user cannot interact with the item. - This flag takes presedence over the other item flags; e.g. if an item is not + This flag takes precedence over the other item flags; e.g. if an item is not enabled, it cannot be selected by the user, even if the Qt::ItemIsSelectable flag has been set. |