2 files changed, 11 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquicktooltip.cpp b/src/quicktemplates2/qquicktooltip.cpp
index b29e806c..3bd47457 100644
--- a/src/quicktemplates2/qquicktooltip.cpp
+++ b/src/quicktemplates2/qquicktooltip.cpp
@@ -188,6 +188,7 @@ void QQuickToolTip::setText(const QString &text)
         return;
 
     d->text = text;
+    setAccessibleName(text);
     emit textChanged();
 }
 
@@ -307,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
diff --git a/src/quicktemplates2/qquicktooltip_p.h b/src/quicktemplates2/qquicktooltip_p.h
index 730e38d9..9b628747 100644
--- a/src/quicktemplates2/qquicktooltip_p.h
+++ b/src/quicktemplates2/qquicktooltip_p.h
@@ -92,6 +92,7 @@ protected:
 
 #ifndef QT_NO_ACCESSIBILITY
     QAccessible::Role accessibleRole() const override;
+    void accessibilityActiveChanged(bool active) override;
 #endif
 
 private: