summaryrefslogtreecommitdiffstats
path: root/src/gui/itemviews
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-25 19:22:37 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-25 19:22:37 (GMT)
commit2b78291003543d45d176424d6d9624d0c02c273c (patch)
treeab21561d2ca288b7b52f8e4d3ab757b50f2ede06 /src/gui/itemviews
parent50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5 (diff)
parentc7afbc97d4cb60ed11996d0bcbbddaac2b18d18c (diff)
downloadQt-2b78291003543d45d176424d6d9624d0c02c273c.zip
Qt-2b78291003543d45d176424d6d9624d0c02c273c.tar.gz
Qt-2b78291003543d45d176424d6d9624d0c02c273c.tar.bz2
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/gui/itemviews')
-rw-r--r--src/gui/itemviews/qabstractitemview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp
index b5ca812..a9612a2 100644
--- a/src/gui/itemviews/qabstractitemview.cpp
+++ b/src/gui/itemviews/qabstractitemview.cpp
@@ -1366,7 +1366,7 @@ bool QAbstractItemView::dragEnabled() const
Note that the model used needs to provide support for drag and drop operations.
- \sa setDragDropMode() {Using drag & drop with item views}
+ \sa setDragDropMode() {Using drag and drop with item views}
*/
/*!