From 1cb1048d7b0d24ea8cbc9ddde965a8eb00feef09 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 30 Jun 2015 14:30:59 +0200 Subject: Refactor ExclusiveGroup Add support for toggled() and toggled(bool) signals to bring ExclusiveGroup 2.0 on par with ExclusiveGroup 1.0. Furthermore, the attached property is now "ExclusiveGroup.group" to be consistent with all other attached properties like StackView.view, TabView.view, and others. It looks clumsy to repeat, but it's better to keep the type names to the minimum, and the documentation also stays in one place. Change-Id: Ic46f8d2ec4b58c5056e8b2bbca5c9f88968bfb80 Reviewed-by: J-P Nurmi --- examples/quick/controls/mirroring/main.qml | 6 +++--- examples/quick/controls/theme/main.qml | 4 ++-- examples/quick/extras/drawer/main.qml | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'examples') diff --git a/examples/quick/controls/mirroring/main.qml b/examples/quick/controls/mirroring/main.qml index cf691486..56306c32 100644 --- a/examples/quick/controls/mirroring/main.qml +++ b/examples/quick/controls/mirroring/main.qml @@ -136,18 +136,18 @@ ApplicationWindow { RadioButton { width: parent.width text: "Portrait" - Exclusive.group: eg + ExclusiveGroup.group: eg } RadioButton { width: parent.width text: "Landscape" - Exclusive.group: eg + ExclusiveGroup.group: eg } RadioButton { width: parent.width text: "Automatic" checked: true - Exclusive.group: eg + ExclusiveGroup.group: eg } } } diff --git a/examples/quick/controls/theme/main.qml b/examples/quick/controls/theme/main.qml index 78285497..f7651a4b 100644 --- a/examples/quick/controls/theme/main.qml +++ b/examples/quick/controls/theme/main.qml @@ -146,14 +146,14 @@ ApplicationWindow { width: parent.width checked: true layoutDirection: Qt.RightToLeft - Exclusive.group: themeGroup + ExclusiveGroup.group: themeGroup } RadioButton { id: darkButton text: "Dark" width: parent.width layoutDirection: Qt.RightToLeft - Exclusive.group: themeGroup + ExclusiveGroup.group: themeGroup } } diff --git a/examples/quick/extras/drawer/main.qml b/examples/quick/extras/drawer/main.qml index 55385a6a..8e36dc68 100644 --- a/examples/quick/extras/drawer/main.qml +++ b/examples/quick/extras/drawer/main.qml @@ -119,21 +119,21 @@ ApplicationWindow { text: "Overlay" checked: true width: parent.width - Exclusive.group: effect + ExclusiveGroup.group: effect layoutDirection: Qt.RightToLeft } RadioButton { id: push text: "Push" width: parent.width - Exclusive.group: effect + ExclusiveGroup.group: effect layoutDirection: Qt.RightToLeft } RadioButton { id: uncover text: "Uncover" width: parent.width - Exclusive.group: effect + ExclusiveGroup.group: effect layoutDirection: Qt.RightToLeft } Rectangle { width: parent.width; height: 1; color: Theme.frameColor } -- cgit v1.2.3