aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2013-12-17 22:53:42 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-18 12:53:42 +0100
commit93355e50de151cc6153d4ec4152e3a81e14cdc77 (patch)
tree0e98295049afd002aa95c292ed2441e9dfc3f30d /src
parent0697a941321ed6688fd2cb7bd60028c56e0e19b6 (diff)
Fix & cleanup whitespace in qquickdrag.cpp docs
Change-Id: I85b986c8b3dca6ccc872807a1d2e8b7b71688c0e Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/quick/items/qquickdrag.cpp40
1 files changed, 19 insertions, 21 deletions
diff --git a/src/quick/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp
index ea130968ca..e36bac4f3f 100644
--- a/src/quick/items/qquickdrag.cpp
+++ b/src/quick/items/qquickdrag.cpp
@@ -507,24 +507,23 @@ void QQuickDragAttached::setProposedAction(Qt::DropAction action)
}
/*!
- \qmlattachedproperty enumeration QtQuick::Drag::dragType
- \since 5.2
-
- This property indicates whether to automatically start drags, do nothing, or
- to use backwards compatible internal drags. The default is to use backwards
- compatible internal drags.
+ \qmlattachedproperty enumeration QtQuick::Drag::dragType
+ \since 5.2
- A drag can also be started manually using \l startDrag.
+ This property indicates whether to automatically start drags, do nothing, or
+ to use backwards compatible internal drags. The default is to use backwards
+ compatible internal drags.
- \list
- \li Drag.None - do not start drags automatically
- \li Drag.Automatic - start drags automatically
- \li Drag.Internal (default) - start backwards compatible drags automatically
- \endlist
+ A drag can also be started manually using \l startDrag.
- When using \l Drag.Automatic you should also define \l mimeData and bind the
- \active property to the active property of \l MouseArea.drag.
+ \list
+ \li Drag.None - do not start drags automatically
+ \li Drag.Automatic - start drags automatically
+ \li Drag.Internal (default) - start backwards compatible drags automatically
+ \endlist
+ When using \l Drag.Automatic you should also define \l mimeData and bind the
+ \active property to the active property of \l MouseArea.drag.
*/
QQuickDrag::DragType QQuickDragAttached::dragType() const
@@ -622,7 +621,6 @@ void QQuickDragAttached::start(QQmlV4Function *args)
\li Qt.LinkAction Create a link from the source to the target.
\li Qt.IgnoreAction Ignore the action (do nothing with the data).
\endlist
-
*/
int QQuickDragAttached::drop()
@@ -696,17 +694,17 @@ void QQuickDragAttached::cancel()
}
/*!
- \qmlsignal QtQuick::DropArea::onDragStarted()
+ \qmlsignal QtQuick::DropArea::onDragStarted()
- This handler is called when a drag is started with the \l startDrag method
- or when it is started automatically using the \l dragType property.
+ This handler is called when a drag is started with the \l startDrag method
+ or when it is started automatically using the \l dragType property.
*/
/*!
- \qmlsignal QtQuick::DropArea::onDragFinished(DropAction action)
+ \qmlsignal QtQuick::DropArea::onDragFinished(DropAction action)
- This handler is called when a drag finishes and the drag was started with the
- \l startDrag method or started automatically using the \l dragType property.
+ This handler is called when a drag finishes and the drag was started with the
+ \l startDrag method or started automatically using the \l dragType property.
*/
Qt::DropAction QQuickDragAttachedPrivate::startDrag(Qt::DropActions supportedActions)