From 4a4842118d2303a8d851d1d8b85fe182d3fe492a Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@qt.io>
Date: Mon, 6 May 2019 16:03:37 +0200
Subject: Accessibility: Make sure StaticText is marked read-only
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Test more of the text properties. This is still very incomplete, but a
small step forward.
Also make sure that editable text reports the editable state.

Fixes: QTBUG-75002
Change-Id: I9e43c980d8fa91671acb4e40e5d9162854884ee7
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
---
 tests/auto/quick/qquickaccessible/data/text.qml | 49 +++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 tests/auto/quick/qquickaccessible/data/text.qml

(limited to 'tests/auto/quick/qquickaccessible/data/text.qml')

diff --git a/tests/auto/quick/qquickaccessible/data/text.qml b/tests/auto/quick/qquickaccessible/data/text.qml
new file mode 100644
index 0000000000..88f292a61f
--- /dev/null
+++ b/tests/auto/quick/qquickaccessible/data/text.qml
@@ -0,0 +1,49 @@
+import QtQuick 2.0
+
+Item {
+    width: 400
+    height: 400
+    Accessible.name: "root"
+    Accessible.role: Accessible.Client
+
+    Text {
+        x: 100
+        y: 20
+        width: 200
+        height: 50
+        text : "Hello Accessibility"
+
+        // Setting any value of the attached property
+        // makes an item accessible.
+        Accessible.name: text
+    }
+
+    Text {
+        x: 100
+        y: 40
+        width: 100
+        height: 40
+        text : "Hello 2"
+        Accessible.role: Accessible.StaticText
+        Accessible.name: "The Hello 2 accessible text"
+        Accessible.description: "A text description"
+    }
+
+    TextInput {
+        x: 100
+        y: 80
+        width: 200
+        height: 40
+        text: "A text input"
+        Accessible.role: Accessible.EditableText
+    }
+
+    TextEdit {
+        x: 100
+        y: 120
+        width: 200
+        height: 100
+        text: "A multi-line text edit\nTesting Accessibility."
+        Accessible.role: Accessible.EditableText
+    }
+}
-- 
cgit v1.2.3


From d12cc4f6b58ecb5f44458002fe9b74d0c84f10ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Arve=20S=C3=A6ther?= <jan-arve.saether@qt.io>
Date: Tue, 7 May 2019 14:58:29 +0200
Subject: Don't overwrite states if role is assigned after a state

We therefore need to keep track of which states have been explicitly set
or not in order to know which ones should get initialized with their
defaults.

Change-Id: I49fdae82288f04ea4f50d45735a93434ac02abec
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
---
 tests/auto/quick/qquickaccessible/data/text.qml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'tests/auto/quick/qquickaccessible/data/text.qml')

diff --git a/tests/auto/quick/qquickaccessible/data/text.qml b/tests/auto/quick/qquickaccessible/data/text.qml
index 88f292a61f..6daeacfd81 100644
--- a/tests/auto/quick/qquickaccessible/data/text.qml
+++ b/tests/auto/quick/qquickaccessible/data/text.qml
@@ -46,4 +46,15 @@ Item {
         text: "A multi-line text edit\nTesting Accessibility."
         Accessible.role: Accessible.EditableText
     }
+
+    Text {
+        x: 100
+        y: 160
+        width: 100
+        height: 40
+        text : "Hello 3"
+        Accessible.name: text
+        Accessible.description: "description"
+    }
+
 }
-- 
cgit v1.2.3