From ae3e7f0799fcdd094e54d792e1a9b13c0e7730aa Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Tue, 4 Oct 2016 17:48:29 +0200
Subject: Add QQuickTumbler::moving

[ChangeLog][Controls][Tumbler] Added a moving-property that describes
whether the tumbler is currently moving, due to the user either
dragging or flicking the tumbler.

Change-Id: Ic86d243cdbdfa8fcd7a7932264332c04a16e020a
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 src/imports/controls/qtquickcontrols2plugin.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/imports/controls/qtquickcontrols2plugin.cpp')

diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp
index 1b75636a..6ccc5c50 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/qquicktumbler_p.h>
 #include <QtQuickControls2/private/qquicktumblerview_p.h>
 
 #include "qquickbusyindicatorring_p.h"
@@ -139,6 +140,9 @@ void QtQuickControls2Plugin::registerTypes(const char *uri)
     qmlRegisterType(selector.select(QStringLiteral("MenuSeparator.qml")), uri, 2, 1, "MenuSeparator");
     qmlRegisterType(selector.select(QStringLiteral("RoundButton.qml")), uri, 2, 1, "RoundButton");
     qmlRegisterType(selector.select(QStringLiteral("ToolSeparator.qml")), uri, 2, 1, "ToolSeparator");
+
+    // QtQuick.Controls 2.2 (Qt 5.9)
+    qmlRegisterRevision<QQuickTumbler, 2>(uri, 2, 2);
 }
 
 static QObject *styleSingleton(QQmlEngine *engine, QJSEngine *scriptEngine)
-- 
cgit v1.2.3