Merge "Merge remote-tracking branch 'origin/dev' into wip/scenegraphng"wip/scenegraphng

1 files changed, 29 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickaccessible/data/statictext.qml b/tests/auto/quick/qquickaccessible/data/text.qml
index 1092f33daf..6daeacfd81 100644
--- a/tests/auto/quick/qquickaccessible/data/statictext.qml
+++ b/tests/auto/quick/qquickaccessible/data/text.qml
@@ -28,4 +28,33 @@ Item {
         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
+    }
+
+    Text {
+        x: 100
+        y: 160
+        width: 100
+        height: 40
+        text : "Hello 3"
+        Accessible.name: text
+        Accessible.description: "description"
+    }
+
 }