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, 24 insertions, 2 deletions

diff --git a/src/quicktemplates2/qquicktooltip.cpp b/src/quicktemplates2/qquicktooltip.cpp
index 8323dbd3..bc3f9d81 100644
--- a/src/quicktemplates2/qquicktooltip.cpp
+++ b/src/quicktemplates2/qquicktooltip.cpp
@@ -62,6 +62,8 @@ QT_BEGIN_NAMESPACE
 
     \image qtquickcontrols2-tooltip.png
 
+    \section2 Attached Tool Tips
+
     The most straight-forward way to setup tool tips for controls is to
     specify \l text and \l {visible}{visibility} via attached properties.
     The following example illustrates this approach:
@@ -186,6 +188,7 @@ void QQuickToolTip::setText(const QString &text)
         return;
 
     d->text = text;
+    setAccessibleName(text);
     emit textChanged();
 }
 
@@ -305,6 +308,15 @@ QAccessible::Role QQuickToolTip::accessibleRole() const
 {
     return QAccessible::ToolTip;
 }
+
+void QQuickToolTip::accessibilityActiveChanged(bool active)
+{
+    Q_D(QQuickToolTip);
+    QQuickPopup::accessibilityActiveChanged(active);
+
+    if (active)
+        setAccessibleName(d->text);
+}
 #endif
 
 class QQuickToolTipAttachedPrivate : public QObjectPrivate
@@ -358,6 +370,8 @@ QQuickToolTipAttached::QQuickToolTipAttached(QObject *parent) :
 
     This attached property holds the text of the shared tool tip.
     The property can be attached to any item.
+
+    \sa {Attached Tool Tips}
 */
 QString QQuickToolTipAttached::text() const
 {
@@ -384,7 +398,7 @@ void QQuickToolTipAttached::setText(const QString &text)
     This attached property holds the delay (milliseconds) of the shared tool tip.
     The property can be attached to any item.
 
-    \sa {Delay and Timeout}
+    \sa {Attached Tool Tips}, {Delay and Timeout}
 */
 int QQuickToolTipAttached::delay() const
 {
@@ -411,7 +425,7 @@ void QQuickToolTipAttached::setDelay(int delay)
     This attached property holds the timeout (milliseconds) of the shared tool tip.
     The property can be attached to any item.
 
-    \sa {Delay and Timeout}
+    \sa {Attached Tool Tips}, {Delay and Timeout}
 */
 int QQuickToolTipAttached::timeout() const
 {
@@ -437,6 +451,8 @@ void QQuickToolTipAttached::setTimeout(int timeout)
 
     This attached property holds whether the shared tool tip is visible.
     The property can be attached to any item.
+
+    \sa {Attached Tool Tips}
 */
 bool QQuickToolTipAttached::isVisible() const
 {
@@ -462,6 +478,8 @@ void QQuickToolTipAttached::setVisible(bool visible)
 
     This attached property holds the shared tool tip instance. The property
     can be attached to any item.
+
+    \sa {Attached Tool Tips}
 */
 QQuickToolTip *QQuickToolTipAttached::toolTip() const
 {
@@ -474,6 +492,8 @@ QQuickToolTip *QQuickToolTipAttached::toolTip() const
 
     This attached method shows the shared tooltip with \a text and \a timeout (milliseconds).
     The method can be attached to any item.
+
+    \sa {Attached Tool Tips}
 */
 void QQuickToolTipAttached::show(const QString &text, int ms)
 {
@@ -495,6 +515,8 @@ void QQuickToolTipAttached::show(const QString &text, int ms)
     \qmlattachedmethod void QtQuick.Controls::ToolTip::hide()
 
     This attached method hides the shared tooltip. The method can be attached to any item.
+
+    \sa {Attached Tool Tips}
 */
 void QQuickToolTipAttached::hide()
 {