From f15468cf9e5c440518a7af9a265234bff8e6c627 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Tue, 20 Dec 2016 21:52:25 +0100
Subject: Add DelayButton

[ChangeLog][Controls][DelayButton] Added DelayButton.

Change-Id: I94820dfb41ba9b90f0a29cda01ac476b54cf3de8
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 .../controls/doc/src/qtquickcontrols2-buttons.qdoc        | 15 +++++++++++++++
 .../controls/doc/src/qtquickcontrols2-customize.qdoc      | 10 ++++++++++
 .../controls/doc/src/qtquickcontrols2-differences.qdoc    |  2 +-
 3 files changed, 26 insertions(+), 1 deletion(-)

(limited to 'src/imports/controls/doc/src')

diff --git a/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc
index 434cf839..6080d7b1 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc
@@ -99,6 +99,21 @@
 
     \b {See also} \l CheckBox
 
+    \section1 DelayButton Control
+
+    \l DelayButton is a button that incorporates a delay before triggering an action.
+    This delay prevents accidental presses.
+
+    \image qtquickcontrols2-delaybutton.gif
+
+    Recommendations:
+    \list
+    \li Use in touch user interfaces.
+    \li Use for actions that must be triggered with care.
+    \endlist
+
+    \b {See also} \l Button and \l AbstractButton
+
     \section1 RadioButton Control
 
     \image qtquickcontrols2-radiobutton.gif
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
index 06201404..82914610 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
@@ -419,6 +419,16 @@
         \snippet qtquickcontrols2-combobox-custom.qml file
 
 
+    \section2 Customizing DelayButton
+
+        DelayButton consists of two visual items: \l {Control::background}{background}
+        and \l {Control::contentItem}{content item}.
+
+        \image qtquickcontrols2-delaybutton-custom.png
+
+        \snippet qtquickcontrols2-delaybutton-custom.qml file
+
+
     \section2 Customizing Dial
 
         Dial consists of two visual items: \l {Control::background}{background}
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
index 01429b94..4ea5e4e6 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
@@ -471,7 +471,7 @@
         \li
     \row
         \li \l [QML QtQuickExtras] {DelayButton}
-        \li \mdash
+        \li \l [QML QtQuickControls2] {DelayButton}
         \li
         \li
     \row
-- 
cgit v1.2.3