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

Conflicts:
	src/imports/controls/BusyIndicator.qml
	src/imports/controls/ProgressBar.qml
	src/quicktemplates2/qquickpopup.cpp
	src/quicktemplates2/qquickpopup_p_p.h
	src/quicktemplates2/qquickstackview.cpp

Change-Id: I9a1028a991de9fc3e26d3f973106301e9ada631c

1 files changed, 18 insertions, 1 deletions

diff --git a/src/quicktemplates2/qquickdialog.cpp b/src/quicktemplates2/qquickdialog.cpp
index 94378a15..ad35f3fc 100644
--- a/src/quicktemplates2/qquickdialog.cpp
+++ b/src/quicktemplates2/qquickdialog.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
     \inqmlmodule QtQuick.Controls
     \ingroup qtquickcontrols2-dialogs
     \ingroup qtquickcontrols2-popups
-    \brief A dialog control.
+    \brief Popup dialog with standard buttons and a title, used for short-term interaction with the user.
     \since 5.8
 
     A dialog is a popup mostly used for short-term tasks and brief communications
@@ -152,6 +152,7 @@ void QQuickDialog::setTitle(const QString &title)
         return;
 
     d->title = title;
+    setAccessibleName(title);
     emit titleChanged();
 }
 
@@ -344,4 +345,20 @@ void QQuickDialog::spacingChange(qreal newSpacing, qreal oldSpacing)
     d->layout->update();
 }
 
+#ifndef QT_NO_ACCESSIBILITY
+QAccessible::Role QQuickDialog::accessibleRole() const
+{
+    return QAccessible::Dialog;
+}
+
+void QQuickDialog::accessibilityActiveChanged(bool active)
+{
+    Q_D(QQuickDialog);
+    QQuickPopup::accessibilityActiveChanged(active);
+
+    if (active)
+        setAccessibleName(d->title);
+}
+#endif
+
 QT_END_NAMESPACE