summaryrefslogtreecommitdiffstats
path: root/src/gui/itemviews
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dietrich-de@nokia.com>2011-02-15 16:10:20 (GMT)
committerGabriel de Dietrich <gabriel.dietrich-de@nokia.com>2011-02-15 16:10:20 (GMT)
commit96abeb8021c48f9651b6a5c62b7cb427b2bc8ccf (patch)
tree69a2ed4ce05b1839d6e050668273c70245076d68 /src/gui/itemviews
parenta38a14b9fb411231443e80cf14d397492f3412dc (diff)
parent0a24d2d6269d509e775f7da91c8002eddc2dcbd7 (diff)
downloadQt-96abeb8021c48f9651b6a5c62b7cb427b2bc8ccf.zip
Qt-96abeb8021c48f9651b6a5c62b7cb427b2bc8ccf.tar.gz
Qt-96abeb8021c48f9651b6a5c62b7cb427b2bc8ccf.tar.bz2
Merge branch 'master-upstream'
Diffstat (limited to 'src/gui/itemviews')
-rw-r--r--src/gui/itemviews/qabstractitemview.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp
index 4dd0aa3..291ec6e 100644
--- a/src/gui/itemviews/qabstractitemview.cpp
+++ b/src/gui/itemviews/qabstractitemview.cpp
@@ -657,9 +657,9 @@ QAbstractItemView::~QAbstractItemView()
deleteLater() functions to explicitly delete them.
The view \e{does not} take ownership of the model unless it is the model's
- parent object because the view may be shared between many different views.
+ parent object because the model may be shared between many different views.
- \sa selectionModel(), setSelectionModel()
+ \sa selectionModel(), setSelectionModel()
*/
void QAbstractItemView::setModel(QAbstractItemModel *model)
{