Merge remote-tracking branch 'origin/5.7' into 5.8

Change-Id: I37aab846346692fd4bff08b0dbab66db3a8e2716

1 files changed, 15 insertions, 2 deletions

diff --git a/src/quicktemplates2/qquickbutton.cpp b/src/quicktemplates2/qquickbutton.cpp
index 19310713..591c4316 100644
--- a/src/quicktemplates2/qquickbutton.cpp
+++ b/src/quicktemplates2/qquickbutton.cpp
@@ -110,6 +110,17 @@ QQuickButton::QQuickButton(QQuickButtonPrivate &dd, QQuickItem *parent) :
     \qmlproperty bool QtQuick.Controls::Button::checkable
 
     This property holds whether the button is checkable.
+
+    A checkable button toggles between checked (on) and unchecked (off) when
+    the user clicks on it or presses the space bar while the button has active
+    focus.
+
+    Setting \l {AbstractButton::}{checked} to \c true forces this property to
+    \c true.
+
+    The default value is \c false.
+
+    \sa CheckBox, Switch
 */
 
 void QQuickButton::checkableChange()
@@ -120,8 +131,10 @@ void QQuickButton::checkableChange()
 /*!
     \qmlproperty bool QtQuick.Controls::Button::autoRepeat
 
-    This property holds whether the button repeats pressed(), released()
-    and clicked() signals while the button is pressed and held down.
+    This property holds whether the button repeats
+    \l {AbstractButton::}{pressed()}, \l {AbstractButton::}{released()}
+    and \l {AbstractButton::}{clicked()} signals while the button is pressed
+    and held down.
 
     The default value is \c false.
 */