From d03c8de38f5838c237b8c2fb50739d770c5fc14e Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Wed, 5 Oct 2016 15:57:47 +0200
Subject: Add QQuickDial::live

[ChangeLog][Controls][Dial] Added a live-property that determines
whether the dial provides live updates for the value-property while
the handle is dragged.

Change-Id: I8da1190df1e9093f81271a8e11f2cea55759573f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 src/imports/controls/Dial.qml                   | 4 ++--
 src/imports/controls/material/Dial.qml          | 2 +-
 src/imports/controls/qtquickcontrols2plugin.cpp | 2 ++
 src/imports/controls/universal/Dial.qml         | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/imports/controls')

diff --git a/src/imports/controls/Dial.qml b/src/imports/controls/Dial.qml
index cc202772..027a6fb5 100644
--- a/src/imports/controls/Dial.qml
+++ b/src/imports/controls/Dial.qml
@@ -35,9 +35,9 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick.Controls 2.2
 import QtQuick.Controls.impl 2.1
-import QtQuick.Templates 2.1 as T
+import QtQuick.Templates 2.2 as T
 
 T.Dial {
     id: control
diff --git a/src/imports/controls/material/Dial.qml b/src/imports/controls/material/Dial.qml
index 7fbf351c..078a45c3 100644
--- a/src/imports/controls/material/Dial.qml
+++ b/src/imports/controls/material/Dial.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Templates 2.1 as T
+import QtQuick.Templates 2.2 as T
 import QtQuick.Controls.Material 2.1
 import QtQuick.Controls.Material.impl 2.1
 
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp
index 97707b49..772429a5 100644
--- a/src/imports/controls/qtquickcontrols2plugin.cpp
+++ b/src/imports/controls/qtquickcontrols2plugin.cpp
@@ -42,6 +42,7 @@
 #include <QtQuickControls2/private/qquickcolorimageprovider_p.h>
 #include <QtQuickTemplates2/private/qquickbuttongroup_p.h>
 #include <QtQuickTemplates2/private/qquickcontainer_p.h>
+#include <QtQuickTemplates2/private/qquickdial_p.h>
 #include <QtQuickTemplates2/private/qquickrangeslider_p.h>
 #include <QtQuickTemplates2/private/qquickslider_p.h>
 #include <QtQuickTemplates2/private/qquicktumbler_p.h>
@@ -144,6 +145,7 @@ void QtQuickControls2Plugin::registerTypes(const char *uri)
     qmlRegisterType(selector.select(QStringLiteral("ToolSeparator.qml")), uri, 2, 1, "ToolSeparator");
 
     // QtQuick.Controls 2.2 (Qt 5.9)
+    qmlRegisterRevision<QQuickDial, 2>(uri, 2, 2);
     qmlRegisterRevision<QQuickRangeSlider, 2>(uri, 2, 2);
     qmlRegisterRevision<QQuickSlider, 2>(uri, 2, 2);
     qmlRegisterRevision<QQuickTumbler, 2>(uri, 2, 2);
diff --git a/src/imports/controls/universal/Dial.qml b/src/imports/controls/universal/Dial.qml
index 64dca3da..4e90bab5 100644
--- a/src/imports/controls/universal/Dial.qml
+++ b/src/imports/controls/universal/Dial.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Templates 2.1 as T
+import QtQuick.Templates 2.2 as T
 import QtQuick.Controls.Universal 2.1
 
 T.Dial {
-- 
cgit v1.2.3