summaryrefslogtreecommitdiffstats
path: root/src/widgets/dialogs/qfilesystemmodel.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-15 01:00:38 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-15 01:00:39 +0100
commitc3123c757a2301445ac286ce2c8af20959151e21 (patch)
treec8f5421725d0fe0cfe8a29136937e54d6f3f95c2 /src/widgets/dialogs/qfilesystemmodel.cpp
parent2cbc5f6f7ae8ba580126a7cafc1898377c2a2407 (diff)
parent7a59d6f138ff8799170cc03d709525ab965d703a (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15
Diffstat (limited to 'src/widgets/dialogs/qfilesystemmodel.cpp')
-rw-r--r--src/widgets/dialogs/qfilesystemmodel.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/dialogs/qfilesystemmodel.cpp b/src/widgets/dialogs/qfilesystemmodel.cpp
index d658f7fe0c..a723c3a955 100644
--- a/src/widgets/dialogs/qfilesystemmodel.cpp
+++ b/src/widgets/dialogs/qfilesystemmodel.cpp
@@ -1213,7 +1213,8 @@ QMimeData *QFileSystemModel::mimeData(const QModelIndexList &indexes) const
/*!
Handles the \a data supplied by a drag and drop operation that ended with
the given \a action over the row in the model specified by the \a row and
- \a column and by the \a parent index.
+ \a column and by the \a parent index. Returns true if the operation was
+ successful.
\sa supportedDropActions()
*/