Merge remote-tracking branch 'origin/5.9' into dev

Conflicts:
	src/quicktemplates2/qquickstackview.cpp
	tests/auto/controls/data/tst_stackview.qml

Change-Id: I9ff4854be8f3c4a0ab943199ae475f3352147965

1 files changed, 10 insertions, 0 deletions

diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp
index 07bf4121..d0a69c2a 100644
--- a/src/quicktemplates2/qquickspinbox.cpp
+++ b/src/quicktemplates2/qquickspinbox.cpp
@@ -497,6 +497,7 @@ void QQuickSpinBox::setEditable(bool editable)
 #endif
 
     d->editable = editable;
+    setAccessibleProperty("editable", editable);
     emit editableChanged();
 }
 
@@ -918,6 +919,15 @@ QAccessible::Role QQuickSpinBox::accessibleRole() const
 {
     return QAccessible::SpinBox;
 }
+
+void QQuickSpinBox::accessibilityActiveChanged(bool active)
+{
+    Q_D(QQuickSpinBox);
+    QQuickControl::accessibilityActiveChanged(active);
+
+    if (active)
+        setAccessibleProperty("editable", d->editable);
+}
 #endif
 
 class QQuickSpinButtonPrivate : public QObjectPrivate