diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 17:36:04 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 17:36:04 +0100 |
| commit | ad67ec26d0cbc98e3440dd38bb20eef4da2ee96d (patch) | |
| tree | 9f8135751df2f995a4f55837ea065a4687245b71 /src/quick/items/qquickdrag.cpp | |
| parent | 83a16630c13969e68cd3a5aaab73335ccb0d4414 (diff) | |
| parent | 20d160d0513a04be187ed851a25b029f47c27b27 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
.qmake.conf
LICENSE.GPLv2
examples/qml/networkaccessmanagerfactory/view.qml
src/qml/jsruntime/qv4runtime.cpp
src/qml/jsruntime/qv4stringobject.cpp
Change-Id: I5d12f436d60995e51d5c2f59d364e9cbc24f8e32
Diffstat (limited to 'src/quick/items/qquickdrag.cpp')
| -rw-r--r-- | src/quick/items/qquickdrag.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp index c23b8bb8a4..7ce649c7eb 100644 --- a/src/quick/items/qquickdrag.cpp +++ b/src/quick/items/qquickdrag.cpp @@ -516,8 +516,8 @@ void QQuickDragAttached::setProposedAction(Qt::DropAction action) \endlist When using \c Drag.Automatic you should also define \l mimeData and bind the - \l active property to the active property of \l MouseArea.drag. - */ + \l active property to the active property of MouseArea : \l {MouseArea::drag.active} +*/ QQuickDrag::DragType QQuickDragAttached::dragType() const { |