Controls: move Accessible from QML to C++

Controls 2.0 could be built with QT_NO_ACCESSIBILITY defined.

Added a few helper functions for accessible in QQuickControl.

Don't set text as Accessible.name for TextArea and TextField.

Change-Id: I40383bbcec2f8c742f709bdec0209623f80da449
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

18 files changed, 0 insertions, 68 deletions

diff --git a/src/imports/controls/BusyIndicator.qml b/src/imports/controls/BusyIndicator.qml
index dde7699f..e8a4babd 100644
--- a/src/imports/controls/BusyIndicator.qml
+++ b/src/imports/controls/BusyIndicator.qml
@@ -44,8 +44,6 @@ T.BusyIndicator {
     implicitWidth: indicator.implicitWidth + leftPadding + rightPadding
     implicitHeight: indicator.implicitHeight + topPadding + bottomPadding
 
-    Accessible.role: Accessible.Indicator
-
     padding: 6
 
     //! [indicator]
diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml
index f6e50f99..19934824 100644
--- a/src/imports/controls/Button.qml
+++ b/src/imports/controls/Button.qml
@@ -46,10 +46,6 @@ T.Button {
     implicitHeight: Math.max(background ? background.implicitHeight : 0,
                              label ? label.implicitHeight + topPadding + bottomPadding : 0)
 
-    Accessible.name: text
-    Accessible.pressed: pressed
-    Accessible.role: Accessible.Button
-
     padding: 6
     leftPadding: 8
     rightPadding: 8
diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml
index e5915b8f..df53fd09 100644
--- a/src/imports/controls/CheckBox.qml
+++ b/src/imports/controls/CheckBox.qml
@@ -49,11 +49,6 @@ T.CheckBox {
                              Math.max(label ? label.implicitHeight : 0,
                                       indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
 
-    Accessible.name: text
-    Accessible.checked: checked
-    Accessible.pressed: pressed
-    Accessible.role: Accessible.CheckBox
-
     padding: 6
     spacing: 6
 
diff --git a/src/imports/controls/Label.qml b/src/imports/controls/Label.qml
index 9c2477b0..ce67db71 100644
--- a/src/imports/controls/Label.qml
+++ b/src/imports/controls/Label.qml
@@ -41,9 +41,6 @@ import QtQuick.Templates 2.0 as T
 T.Label {
     id: control
 
-    Accessible.name: text
-    Accessible.role: Accessible.StaticText
-
     color: Theme.textColor
     linkColor: Theme.focusColor // TODO
 }
diff --git a/src/imports/controls/PageIndicator.qml b/src/imports/controls/PageIndicator.qml
index 4891951b..55e9a40e 100644
--- a/src/imports/controls/PageIndicator.qml
+++ b/src/imports/controls/PageIndicator.qml
@@ -41,8 +41,6 @@ import QtQuick.Templates 2.0 as T
 T.PageIndicator {
     id: control
 
-    Accessible.role: Accessible.Indicator
-
     implicitWidth: Math.max(background ? background.implicitWidth : 0,
                             contentItem.implicitWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(background ? background.implicitHeight : 0,
diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/ProgressBar.qml
index fbb469be..3a040573 100644
--- a/src/imports/controls/ProgressBar.qml
+++ b/src/imports/controls/ProgressBar.qml
@@ -46,8 +46,6 @@ T.ProgressBar {
     implicitHeight: Math.max(background ? background.implicitHeight : 0,
                              indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding
 
-    Accessible.role: Accessible.ProgressBar
-
     padding: 6
 
     //! [indicator]
diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml
index 16bf4f89..5c94382f 100644
--- a/src/imports/controls/RadioButton.qml
+++ b/src/imports/controls/RadioButton.qml
@@ -49,11 +49,6 @@ T.RadioButton {
                              Math.max(label ? label.implicitHeight : 0,
                                       indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
 
-    Accessible.name: text
-    Accessible.checked: checked
-    Accessible.pressed: pressed
-    Accessible.role: Accessible.RadioButton
-
     padding: 6
     spacing: 6
 
diff --git a/src/imports/controls/ScrollBar.qml b/src/imports/controls/ScrollBar.qml
index a0821ac0..c3ae743d 100644
--- a/src/imports/controls/ScrollBar.qml
+++ b/src/imports/controls/ScrollBar.qml
@@ -46,9 +46,6 @@ T.ScrollBar {
     implicitHeight: Math.max(background ? background.implicitHeight : 0,
                              handle.implicitHeight + topPadding + bottomPadding)
 
-    Accessible.pressed: pressed
-    Accessible.role: Accessible.ScrollBar
-
     padding: 2
 
     //! [handle]
diff --git a/src/imports/controls/ScrollIndicator.qml b/src/imports/controls/ScrollIndicator.qml
index fb6f9277..b02f6c1f 100644
--- a/src/imports/controls/ScrollIndicator.qml
+++ b/src/imports/controls/ScrollIndicator.qml
@@ -46,8 +46,6 @@ T.ScrollIndicator {
     implicitHeight: Math.max(background ? background.implicitHeight : 0,
                              indicator.implicitHeight + topPadding + bottomPadding)
 
-    Accessible.role: Accessible.Indicator
-
     padding: 2
 
     //! [indicator]
diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml
index 1074b6dd..309c07cd 100644
--- a/src/imports/controls/Slider.qml
+++ b/src/imports/controls/Slider.qml
@@ -48,9 +48,6 @@ T.Slider {
                              Math.max(track ? track.implicitHeight : 0,
                                       handle ? handle.implicitHeight : 0) + topPadding + bottomPadding)
 
-    Accessible.pressed: pressed
-    Accessible.role: Accessible.Slider
-
     padding: 6
 
     //! [handle]
diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml
index 6ddf840f..0eafc2b2 100644
--- a/src/imports/controls/Switch.qml
+++ b/src/imports/controls/Switch.qml
@@ -49,12 +49,6 @@ T.Switch {
                              Math.max(label ? label.implicitHeight : 0,
                                       indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
 
-    Accessible.name: text
-    Accessible.checkable: true
-    Accessible.checked: checked
-    Accessible.pressed: pressed
-    Accessible.role: Accessible.Button // TODO: Switch?
-
     padding: 6
     spacing: 6
 
diff --git a/src/imports/controls/TabBar.qml b/src/imports/controls/TabBar.qml
index 89ab3166..173cad37 100644
--- a/src/imports/controls/TabBar.qml
+++ b/src/imports/controls/TabBar.qml
@@ -46,8 +46,6 @@ T.TabBar {
     implicitHeight: Math.max(background ? background.implicitHeight : 0,
                              contentItem.implicitHeight + topPadding + bottomPadding)
 
-    Accessible.role: Accessible.PageTabList
-
     spacing: 1
 
     //! [contentItem]
diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/TabButton.qml
index c5ca6f72..b1a88b00 100644
--- a/src/imports/controls/TabButton.qml
+++ b/src/imports/controls/TabButton.qml
@@ -46,11 +46,6 @@ T.TabButton {
     implicitHeight: Math.max(background ? background.implicitHeight : 0,
                              label ? label.implicitHeight + topPadding + bottomPadding : 0)
 
-    Accessible.name: text
-    Accessible.pressed: pressed
-    Accessible.selected: checked
-    Accessible.role: Accessible.PageTab
-
     padding: 6
 
     //! [label]
diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml
index 52b7ade4..0ce489ff 100644
--- a/src/imports/controls/TextArea.qml
+++ b/src/imports/controls/TextArea.qml
@@ -41,12 +41,6 @@ import QtQuick.Templates 2.0 as T
 T.TextArea {
     id: control
 
-    Accessible.name: text
-    Accessible.multiLine: true
-    Accessible.role: Accessible.EditableText
-    Accessible.readOnly: readOnly
-    Accessible.description: placeholder ? placeholder.text : ""
-
     color: enabled ? Theme.textColor : Theme.disabledColor
     selectionColor: Theme.selectionColor
     selectedTextColor: Theme.selectedTextColor
diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml
index ca477107..98baebbc 100644
--- a/src/imports/controls/TextField.qml
+++ b/src/imports/controls/TextField.qml
@@ -41,12 +41,6 @@ import QtQuick.Templates 2.0 as T
 T.TextField {
     id: control
 
-    Accessible.name: text
-    Accessible.role: Accessible.EditableText
-    Accessible.readOnly: readOnly
-    Accessible.description: placeholder ? placeholder.text : ""
-    Accessible.passwordEdit: echoMode === TextInput.Password || echoMode === TextInput.PasswordEchoOnEdit
-
     padding: 6
 
     color: enabled ? Theme.textColor : Theme.disabledColor
diff --git a/src/imports/controls/ToggleButton.qml b/src/imports/controls/ToggleButton.qml
index 8a732f02..e533b154 100644
--- a/src/imports/controls/ToggleButton.qml
+++ b/src/imports/controls/ToggleButton.qml
@@ -49,12 +49,6 @@ T.ToggleButton {
                              Math.max(label ? label.implicitHeight : 0,
                                       indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
 
-    Accessible.name: text
-    Accessible.checkable: true
-    Accessible.checked: checked
-    Accessible.pressed: pressed
-    Accessible.role: Accessible.Button
-
     padding: 6
     spacing: 6
 
diff --git a/src/imports/controls/ToolBar.qml b/src/imports/controls/ToolBar.qml
index 2c0fb5f0..db3d65c1 100644
--- a/src/imports/controls/ToolBar.qml
+++ b/src/imports/controls/ToolBar.qml
@@ -47,8 +47,6 @@ T.ToolBar {
     contentWidth: contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0
     contentHeight: contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0
 
-    Accessible.role: Accessible.ToolBar
-
     //! [contentItem]
     contentItem: Item { }
     //! [contentItem]
diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml
index 4eac37fd..f68653b3 100644
--- a/src/imports/controls/ToolButton.qml
+++ b/src/imports/controls/ToolButton.qml
@@ -46,10 +46,6 @@ T.ToolButton {
     implicitHeight: Math.max(background ? background.implicitHeight : 0,
                              label ? label.implicitHeight + topPadding + bottomPadding : 0)
 
-    Accessible.name: text
-    Accessible.pressed: pressed
-    Accessible.role: Accessible.Button
-
     padding: 6
 
     //! [label]