From 7fe5e4c6858a74db582d95fae29a591b40ff7cdd Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Thu, 2 Feb 2017 23:19:04 +0100
Subject: Add ButtonGroup::exclusive

[ChangeLog][Controls][ButtonGroup] Added exclusive property to allow
creating non-exclusive button groups.

Change-Id: Ic2f3f4bac852f03e5c25f9010993d62234a71e0b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 src/imports/controls/qtquickcontrols2plugin.cpp   | 1 +
 src/imports/templates/qtquicktemplates2plugin.cpp | 1 +
 2 files changed, 2 insertions(+)

(limited to 'src/imports')

diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp
index aa4eb295..48d027dd 100644
--- a/src/imports/controls/qtquickcontrols2plugin.cpp
+++ b/src/imports/controls/qtquickcontrols2plugin.cpp
@@ -158,6 +158,7 @@ void QtQuickControls2Plugin::registerTypes(const char *uri)
     // QtQuick.Controls 2.3 (new types in Qt 5.10)
     qmlRegisterType<QQuickAction>(uri, 2, 3, "Action");
     qmlRegisterType<QQuickActionGroup>(uri, 2, 3, "ActionGroup");
+    qmlRegisterType<QQuickButtonGroup, 3>(uri, 2, 3, "ButtonGroup");
     qmlRegisterType<QQuickIcon>();
 }
 
diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp
index e16a0e45..32779b4a 100644
--- a/src/imports/templates/qtquicktemplates2plugin.cpp
+++ b/src/imports/templates/qtquicktemplates2plugin.cpp
@@ -260,6 +260,7 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri)
     qmlRegisterType<QQuickAbstractButton, 3>(uri, 2, 3, "AbstractButton");
     qmlRegisterType<QQuickAction>(uri, 2, 3, "Action");
     qmlRegisterType<QQuickActionGroup>(uri, 2, 3, "ActionGroup");
+    qmlRegisterType<QQuickButtonGroup, 3>(uri, 2, 3, "ButtonGroup");
     qmlRegisterType<QQuickIcon>();
     qmlRegisterType<QQuickRangeSlider, 3>(uri, 2, 3, "RangeSlider");
     qmlRegisterType<QQuickScrollBar, 3>(uri, 2, 3, "ScrollBar");
-- 
cgit v1.2.3