diff options
| author | Liang Qi <[email protected]> | 2016-10-27 12:27:54 +0200 |
|---|---|---|
| committer | Liang Qi <[email protected]> | 2016-10-27 12:27:54 +0200 |
| commit | 9d085bf0024c442b14b7d22bc629574058176deb (patch) | |
| tree | 98dc9c7703454906e66f022688bbc9a01f10ea5f /src/quick/items/qquickdrag.cpp | |
| parent | 621c5b2b260d63fef7190c133f7384b8ccb93307 (diff) | |
| parent | 6b58ce5251045fb751eb511b2cb3571bcd113f28 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8v5.8.0-beta1
Conflicts:
tests/auto/quick/qquicktextedit/BLACKLIST
Change-Id: I0b9e5bea5da5d2666887c202e62d889b4aa56900
Diffstat (limited to 'src/quick/items/qquickdrag.cpp')
| -rw-r--r-- | src/quick/items/qquickdrag.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp index b943c28661..cbb052856e 100644 --- a/src/quick/items/qquickdrag.cpp +++ b/src/quick/items/qquickdrag.cpp @@ -749,7 +749,7 @@ void QQuickDragAttached::cancel() */ /*! - \qmlattachedsignal QtQuick::Drag::dragFinished(DropAction action) + \qmlattachedsignal QtQuick::Drag::dragFinished(DropAction dropAction) This signal is emitted when a drag finishes and the drag was started with the \l startDrag() method or started automatically using the \l dragType property. |