1 files changed, 27 insertions, 1 deletions
diff --git a/examples/quick/dialogs/systemdialogs/CustomDialogs.qml b/examples/quick/dialogs/systemdialogs/CustomDialogs.qml
index 2a31147eb..389979ef5 100644
--- a/examples/quick/dialogs/systemdialogs/CustomDialogs.qml
+++ b/examples/quick/dialogs/systemdialogs/CustomDialogs.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.1
-import QtQuick.Controls 1.1
+import QtQuick.Controls 1.2
 import QtQuick.Dialogs 1.2
 import QtQuick.Layouts 1.1
 import QtQuick.Window 2.0
@@ -102,6 +102,7 @@ Item {
                 Layout.alignment: Qt.AlignHCenter
                 SpinBox {
                     id: answer
+                    onEditingFinished: spinboxDialog.click(StandardButton.Ok)
                 }
                 Text {
                     text: "m/s"
@@ -111,6 +112,25 @@ Item {
         }
     }
 
+    Dialog {
+        id: dateDialog
+        modality: dialogModal.checked ? Qt.WindowModal : Qt.NonModal
+        title: customizeTitle.checked ? windowTitleField.text : "Choose a date"
+        onButtonClicked: console.log("clicked button " + clickedButton)
+        onAccepted: {
+            if (clickedButton == StandardButton.Ok)
+                lastChosen.text = "Accepted " + calendar.selectedDate.toLocaleDateString()
+            else
+                lastChosen.text = (clickedButton == StandardButton.Retry ? "(Retry)" : "(Ignore)")
+        }
+
+        Calendar {
+            id: calendar
+            width: parent ? parent.width : implicitWidth
+            onDoubleClicked: dateDialog.click(StandardButton.Ok)
+        }
+    }
+
     Column {
         anchors.fill: parent
         anchors.margins: 12
@@ -154,6 +174,7 @@ Item {
                     buttons = StandardButton.Ok
                 helloDialog.standardButtons = buttons
                 spinboxDialog.standardButtons = buttons
+                dateDialog.standardButtons = buttons
                 updating = false
             }
 
@@ -257,6 +278,11 @@ Item {
                 anchors.verticalCenter: parent.verticalCenter
                 onClicked: spinboxDialog.open()
             }
+            Button {
+                text: "Date picker"
+                anchors.verticalCenter: parent.verticalCenter
+                onClicked: dateDialog.open()
+            }
         }
     }
 }