diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-26 16:03:35 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-26 16:03:35 (GMT) |
| commit | 0a1a3606b6a3f466b4e48c64ad30040c729c2ca9 (patch) | |
| tree | 2ea385d76008fdd9ec3fa397ae877838adc1fa99 /src/gui/itemviews | |
| parent | 2c0c3a213d44ad53023a507e19d18d1e5d359aec (diff) | |
| parent | e68210d2086fbdc8252298f8d7781bf84f73b6ab (diff) | |
| download | Qt-0a1a3606b6a3f466b4e48c64ad30040c729c2ca9.zip Qt-0a1a3606b6a3f466b4e48c64ad30040c729c2ca9.tar.gz Qt-0a1a3606b6a3f466b4e48c64ad30040c729c2ca9.tar.bz2 | |
Merge branch 4.6 into qt-4.7-from-4.6
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 7b81761..acc8deb 100644 --- a/src/gui/itemviews/qabstractitemview.cpp +++ b/src/gui/itemviews/qabstractitemview.cpp @@ -827,7 +827,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. @@ -885,7 +885,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. |