aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickswipedelegate.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-11-02 13:05:58 +0100
committerJ-P Nurmi <jpnurmi@qt.io>2016-11-02 13:05:58 +0100
commit5169a1ecd03eaea95ab07aeefc8d76cca7530563 (patch)
tree2666aecdf5a9c90d9b68dd7df8c6b5d1507541a6 /src/quicktemplates2/qquickswipedelegate.cpp
parent7decf1ee51df6c772b84ba8bed2f1e3d0e344908 (diff)
parent814601e9cdf5895152cedcd1968fd2a4eecd3cd3 (diff)
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts: src/imports/controls/Drawer.qml src/imports/controls/Frame.qml src/imports/controls/GroupBox.qml src/imports/controls/Page.qml src/imports/controls/Pane.qml src/imports/controls/ToolBar.qml src/imports/controls/Tumbler.qml src/quicktemplates2/qquickapplicationwindow.cpp src/quicktemplates2/qquickpopup.cpp tests/auto/accessibility/data/busyindicator.qml tests/auto/accessibility/data/button.qml tests/auto/accessibility/data/checkbox.qml tests/auto/accessibility/data/control.qml tests/auto/accessibility/data/dial.qml tests/auto/accessibility/data/label.qml tests/auto/accessibility/data/menu.qml tests/auto/accessibility/data/pageindicator.qml tests/auto/accessibility/data/popup.qml tests/auto/accessibility/data/progressbar.qml tests/auto/accessibility/data/radiobutton.qml tests/auto/accessibility/data/rangeslider.qml tests/auto/accessibility/data/scrollbar.qml tests/auto/accessibility/data/scrollindicator.qml tests/auto/accessibility/data/slider.qml tests/auto/accessibility/data/spinbox.qml tests/auto/accessibility/data/switch.qml tests/auto/accessibility/data/tabbar.qml tests/auto/accessibility/data/tabbutton.qml tests/auto/accessibility/data/textarea.qml tests/auto/accessibility/data/textfield.qml tests/auto/accessibility/data/toolbar.qml tests/auto/accessibility/data/toolbutton.qml tests/auto/accessibility/tst_accessibility.cpp Change-Id: Ibc3f592162e97bef9147b35da8c9a79e73a907e6
Diffstat (limited to 'src/quicktemplates2/qquickswipedelegate.cpp')
-rw-r--r--src/quicktemplates2/qquickswipedelegate.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quicktemplates2/qquickswipedelegate.cpp b/src/quicktemplates2/qquickswipedelegate.cpp
index ef7f6ed5..fe678b80 100644
--- a/src/quicktemplates2/qquickswipedelegate.cpp
+++ b/src/quicktemplates2/qquickswipedelegate.cpp
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
\inqmlmodule QtQuick.Controls
\since 5.7
\ingroup qtquickcontrols2-delegates
- \brief A swipable item delegate.
+ \brief Swipable item delegate.
SwipeDelegate presents a view item that can be swiped left or right to
expose more options or information. It is used as a delegate in views such
@@ -818,13 +818,13 @@ QQuickSwipeDelegate::QQuickSwipeDelegate(QQuickItem *parent) :
\li Description
\row
\li position
- \li This property holds the position of the swipe relative to either
+ \li This read-only property holds the position of the swipe relative to either
side of the control. When this value reaches either
\c -1.0 (left side) or \c 1.0 (right side) and the mouse button is
released, \c complete will be \c true.
\row
\li complete
- \li This property holds whether the control is fully exposed after
+ \li This read-only property holds whether the control is fully exposed after
having been swiped to the left or right.
When complete is \c true, any interactive items declared in \c left,
@@ -860,19 +860,19 @@ QQuickSwipeDelegate::QQuickSwipeDelegate(QQuickItem *parent) :
\include qquickswipedelegate-interaction.qdocinc
\row
\li leftItem
- \li This property holds the item instantiated from the \c left component.
+ \li This read-only property holds the item instantiated from the \c left component.
If \c left has not been set, or the position hasn't changed since
creation of the SwipeDelegate, this property will be \c null.
\row
\li behindItem
- \li This property holds the item instantiated from the \c behind component.
+ \li This read-only property holds the item instantiated from the \c behind component.
If \c behind has not been set, or the position hasn't changed since
creation of the SwipeDelegate, this property will be \c null.
\row
\li rightItem
- \li This property holds the item instantiated from the \c right component.
+ \li This read-only property holds the item instantiated from the \c right component.
If \c right has not been set, or the position hasn't changed since
creation of the SwipeDelegate, this property will be \c null.