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

Change-Id: I37aab846346692fd4bff08b0dbab66db3a8e2716

1 files changed, 9 insertions, 4 deletions

diff --git a/src/quicktemplates2/qquickcheckdelegate.cpp b/src/quicktemplates2/qquickcheckdelegate.cpp
index 09be5d60..249aaa95 100644
--- a/src/quicktemplates2/qquickcheckdelegate.cpp
+++ b/src/quicktemplates2/qquickcheckdelegate.cpp
@@ -54,9 +54,14 @@ QT_BEGIN_NAMESPACE
 
     CheckDelegate presents an item delegate that can be toggled on (checked) or
     off (unchecked). Check delegates are typically used to select one or more
-    options from a set of options.
-
-    The state of the check delegate can be set with the
+    options from a set of options in a list. For smaller sets of options, or
+    for options that need to be uniquely identifiable, consider using
+    \l CheckBox instead.
+
+    CheckDelegate inherits its API from \l ItemDelegate, which is inherited
+    from AbstractButton. For instance, you can set \l {AbstractButton::text}{text},
+    and react to \l {AbstractButton::clicked}{clicks} using the AbstractButton
+    API. The state of the check delegate can be set with the
     \l {AbstractButton::}{checked} property.
 
     In addition to the checked and unchecked states, there is a third state:
@@ -75,7 +80,7 @@ QT_BEGIN_NAMESPACE
     }
     \endcode
 
-    \sa {Customizing CheckDelegate}, {Delegate Controls}
+    \sa {Customizing CheckDelegate}, {Delegate Controls}, CheckBox
 */
 
 class QQuickCheckDelegatePrivate : public QQuickItemDelegatePrivate