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

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

Change-Id: I9ff4854be8f3c4a0ab943199ae475f3352147965

5 files changed, 17 insertions, 1 deletions

diff --git a/src/imports/controls/material/material.pro b/src/imports/controls/material/material.pro
index 08d5e3ab..5d036b61 100644
--- a/src/imports/controls/material/material.pro
+++ b/src/imports/controls/material/material.pro
@@ -19,6 +19,7 @@ SOURCES += \
 RESOURCES += \
     $$PWD/qtquickcontrols2materialstyleplugin.qrc
 
+!static: CONFIG += qmlcache
 CONFIG += no_cxx_module
 load(qml_plugin)
 
diff --git a/src/imports/controls/universal/universal.pro b/src/imports/controls/universal/universal.pro
index d9bae111..016fa085 100644
--- a/src/imports/controls/universal/universal.pro
+++ b/src/imports/controls/universal/universal.pro
@@ -19,6 +19,7 @@ SOURCES += \
 RESOURCES += \
     $$PWD/qtquickcontrols2universalstyleplugin.qrc
 
+!static: CONFIG += qmlcache
 CONFIG += no_cxx_module
 load(qml_plugin)
 
diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp
index c2fc3aff..fcf90000 100644
--- a/src/quicktemplates2/qquickcombobox.cpp
+++ b/src/quicktemplates2/qquickcombobox.cpp
@@ -792,6 +792,7 @@ void QQuickComboBox::setEditable(bool editable)
     }
 
     d->extra.value().editable = editable;
+    setAccessibleProperty("editable", editable);
     emit editableChanged();
 }
 
@@ -1590,8 +1591,10 @@ void QQuickComboBox::accessibilityActiveChanged(bool active)
     Q_D(QQuickComboBox);
     QQuickControl::accessibilityActiveChanged(active);
 
-    if (active)
+    if (active) {
         setAccessibleName(d->hasDisplayText ? d->displayText : d->currentText);
+        setAccessibleProperty("editable", isEditable());
+    }
 }
 #endif //
 
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
diff --git a/src/quicktemplates2/qquickspinbox_p.h b/src/quicktemplates2/qquickspinbox_p.h
index 27956d7c..b5986a2a 100644
--- a/src/quicktemplates2/qquickspinbox_p.h
+++ b/src/quicktemplates2/qquickspinbox_p.h
@@ -151,6 +151,7 @@ protected:
 
 #if QT_CONFIG(accessibility)
     QAccessible::Role accessibleRole() const override;
+    void accessibilityActiveChanged(bool active) override;
 #endif
 
 private: