diff options
| author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-11-04 14:25:29 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-11-06 17:48:12 +0000 |
| commit | dbc2a90b24cd8dcfd58a9f571981e38761a3bf3b (patch) | |
| tree | 8bf7ea670bfc032bc4f7a1c59c2a0d9702e4973f /examples | |
| parent | 954eb6121ff149dc14a17328990c8ad1a5fc7190 (diff) | |
Repurpose ExclusiveGroup to ButtonGroup
This is another way of solving the naming clash with Qt Quick Controls,
and narrows our focus to the types of controls that actually make sense
to have in an "exclusive" group; buttons (Android calls them
"selection controls").
Change-Id: Icf6efe583fe784c3594de8635be84bbf757a55cd
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/labs/controls/drawer/main.qml | 8 | ||||
| -rw-r--r-- | examples/labs/controls/mirroring/main.qml | 8 | ||||
| -rw-r--r-- | examples/labs/controls/theme/main.qml | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/examples/labs/controls/drawer/main.qml b/examples/labs/controls/drawer/main.qml index 5b30a098..5fba80b3 100644 --- a/examples/labs/controls/drawer/main.qml +++ b/examples/labs/controls/drawer/main.qml @@ -90,7 +90,7 @@ ApplicationWindow { width: window.width / 3 * 2 height: window.height - ExclusiveGroup { + ButtonGroup { id: effect } @@ -118,21 +118,21 @@ ApplicationWindow { text: "Overlay" checked: true width: parent.width - ExclusiveGroup.group: effect + ButtonGroup.group: effect layoutDirection: Qt.RightToLeft } RadioButton { id: push text: "Push" width: parent.width - ExclusiveGroup.group: effect + ButtonGroup.group: effect layoutDirection: Qt.RightToLeft } RadioButton { id: uncover text: "Uncover" width: parent.width - ExclusiveGroup.group: effect + ButtonGroup.group: effect layoutDirection: Qt.RightToLeft } Rectangle { width: parent.width; height: 1; color: Theme.frameColor } diff --git a/examples/labs/controls/mirroring/main.qml b/examples/labs/controls/mirroring/main.qml index 3cc6f502..69218a86 100644 --- a/examples/labs/controls/mirroring/main.qml +++ b/examples/labs/controls/mirroring/main.qml @@ -130,24 +130,24 @@ ApplicationWindow { title: "RadioButton" readonly property real preferredWidth: (flow.width - 12) / 2 width: window.width > window.height || contentWidth > preferredWidth ? flow.width : preferredWidth - ExclusiveGroup { id: eg } + ButtonGroup { id: eg } ColumnLayout { width: parent.width RadioButton { width: parent.width text: "Portrait" - ExclusiveGroup.group: eg + ButtonGroup.group: eg } RadioButton { width: parent.width text: "Landscape" - ExclusiveGroup.group: eg + ButtonGroup.group: eg } RadioButton { width: parent.width text: "Automatic" checked: true - ExclusiveGroup.group: eg + ButtonGroup.group: eg } } } diff --git a/examples/labs/controls/theme/main.qml b/examples/labs/controls/theme/main.qml index 3b970f58..32221764 100644 --- a/examples/labs/controls/theme/main.qml +++ b/examples/labs/controls/theme/main.qml @@ -130,7 +130,7 @@ ApplicationWindow { color: Theme.frameColor } - ExclusiveGroup { + ButtonGroup { id: themeGroup } @@ -143,14 +143,14 @@ ApplicationWindow { width: parent.width checked: true layoutDirection: Qt.RightToLeft - ExclusiveGroup.group: themeGroup + ButtonGroup.group: themeGroup } RadioButton { id: darkButton text: "Dark" width: parent.width layoutDirection: Qt.RightToLeft - ExclusiveGroup.group: themeGroup + ButtonGroup.group: themeGroup } } |