Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp

Change-Id: I18a9d83fc14f4a9afdb1e40523ec51e3fa1d7754

1 files changed, 4 insertions, 2 deletions

diff --git a/src/corelib/itemmodels/qabstractitemmodel.cpp b/src/corelib/itemmodels/qabstractitemmodel.cpp
index f152dec5e6..4162e843a7 100644
--- a/src/corelib/itemmodels/qabstractitemmodel.cpp
+++ b/src/corelib/itemmodels/qabstractitemmodel.cpp
@@ -1911,8 +1911,8 @@ Qt::DropActions QAbstractItemModel::supportedDropActions() const
 /*!
     Returns the actions supported by the data in this model.
 
-    The default implementation returns supportedDropActions() unless specific
-    values have been set with setSupportedDragActions().
+    The default implementation returns supportedDropActions(). Reimplement
+    this function if you wish to support additional actions.
 
     supportedDragActions() is used by QAbstractItemView::startDrag() as the
     default values when a drag occurs.
@@ -1941,6 +1941,8 @@ void QAbstractItemModel::doSetSupportedDragActions(Qt::DropActions actions)
     \obsolete
     \fn void QAbstractItemModel::setSupportedDragActions(Qt::DropActions actions)
 
+    This function is obsolete. Reimplement supportedDragActions() instead.
+
     Sets the supported drag \a actions for the items in the model.
 
     \sa supportedDragActions(), {Using drag and drop with item views}