Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: I3eb5d1affe64b6ae709d1154cc37de91db3816b6

2 files changed, 17 insertions, 0 deletions

diff --git a/src/quick/accessible/qaccessiblequickitem.cpp b/src/quick/accessible/qaccessiblequickitem.cpp
index 98e7663c96..b87203c3ef 100644
--- a/src/quick/accessible/qaccessiblequickitem.cpp
+++ b/src/quick/accessible/qaccessiblequickitem.cpp
@@ -382,6 +382,22 @@ QString QAccessibleQuickItem::text(QAccessible::Text textType) const
     return QString();
 }
 
+void QAccessibleQuickItem::setText(QAccessible::Text textType, const QString &text)
+{
+    if (role() != QAccessible::EditableText)
+        return;
+    if (textType != QAccessible::Value)
+        return;
+
+    if (QTextDocument *doc = textDocument()) {
+        doc->setPlainText(text);
+        return;
+    }
+    auto textPropertyName = "text";
+    if (object()->metaObject()->indexOfProperty(textPropertyName) >= 0)
+        object()->setProperty(textPropertyName, text);
+}
+
 void *QAccessibleQuickItem::interface_cast(QAccessible::InterfaceType t)
 {
     QAccessible::Role r = role();
diff --git a/src/quick/accessible/qaccessiblequickitem_p.h b/src/quick/accessible/qaccessiblequickitem_p.h
index 5375d37bf0..931e995f0f 100644
--- a/src/quick/accessible/qaccessiblequickitem_p.h
+++ b/src/quick/accessible/qaccessiblequickitem_p.h
@@ -83,6 +83,7 @@ public:
     QAccessible::State state() const override;
     QAccessible::Role role() const override;
     QString text(QAccessible::Text) const override;
+    void setText(QAccessible::Text, const QString &text) override;
 
     bool isAccessible() const;