Fix accessibility

Add missing componentComplete() -> accessibilityActiveChanged(true)
calls to QQuickTextField, QQuickTextArea, and QQuickPopup.

Task-number: QTBUG-53157
Change-Id: I0e79d7f1412c24f4d129c58ba1e7edf20b8d8ecf
Reviewed-by: Liang Qi <liang.qi@qt.io>

8 files changed, 38 insertions, 0 deletions

diff --git a/src/quicktemplates2/qquicklabel.cpp b/src/quicktemplates2/qquicklabel.cpp
index c9e61993..22b2df61 100644
--- a/src/quicktemplates2/qquicklabel.cpp
+++ b/src/quicktemplates2/qquicklabel.cpp
@@ -221,6 +221,16 @@ void QQuickLabel::classBegin()
     d->resolveFont();
 }
 
+void QQuickLabel::componentComplete()
+{
+    Q_D(QQuickLabel);
+    QQuickText::componentComplete();
+#ifndef QT_NO_ACCESSIBILITY
+    if (!d->accessibleAttached && QAccessible::isActive())
+        d->accessibilityActiveChanged(true);
+#endif
+}
+
 void QQuickLabel::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &value)
 {
     Q_D(QQuickLabel);
diff --git a/src/quicktemplates2/qquicklabel_p.h b/src/quicktemplates2/qquicklabel_p.h
index bae4d296..c4484d26 100644
--- a/src/quicktemplates2/qquicklabel_p.h
+++ b/src/quicktemplates2/qquicklabel_p.h
@@ -77,6 +77,7 @@ Q_SIGNALS:
 
 protected:
     void classBegin() override;
+    void componentComplete() override;
 
     void itemChange(ItemChange change, const ItemChangeData &value) override;
     void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index bb530162..47e85e73 100644
--- a/src/quicktemplates2/qquickpopup.cpp
+++ b/src/quicktemplates2/qquickpopup.cpp
@@ -1753,6 +1753,8 @@ void QQuickPopup::setFiltersChildMouseEvents(bool filter)
 
 void QQuickPopup::classBegin()
 {
+    Q_D(QQuickPopup);
+    d->popupItem->classBegin();
 }
 
 void QQuickPopup::componentComplete()
@@ -1763,6 +1765,7 @@ void QQuickPopup::componentComplete()
         setParentItem(qobject_cast<QQuickItem *>(parent()));
     if (d->visible)
         d->transitionManager.transitionEnter();
+    d->popupItem->componentComplete();
 }
 
 bool QQuickPopup::isComponentComplete() const
diff --git a/src/quicktemplates2/qquickpopup_p_p.h b/src/quicktemplates2/qquickpopup_p_p.h
index 4518cd09..3ff55129 100644
--- a/src/quicktemplates2/qquickpopup_p_p.h
+++ b/src/quicktemplates2/qquickpopup_p_p.h
@@ -119,6 +119,8 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QQuickPopupItem)
+
+    friend class QQuickPopup;
 };
 
 class QQuickPopupPositioner : public QQuickItemChangeListener
diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp
index 20fa8ef8..69af1700 100644
--- a/src/quicktemplates2/qquicktextarea.cpp
+++ b/src/quicktemplates2/qquicktextarea.cpp
@@ -477,6 +477,16 @@ void QQuickTextArea::classBegin()
     d->resolveFont();
 }
 
+void QQuickTextArea::componentComplete()
+{
+    Q_D(QQuickTextArea);
+    QQuickTextEdit::componentComplete();
+#ifndef QT_NO_ACCESSIBILITY
+    if (!d->accessibleAttached && QAccessible::isActive())
+        d->accessibilityActiveChanged(true);
+#endif
+}
+
 void QQuickTextArea::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &value)
 {
     Q_D(QQuickTextArea);
diff --git a/src/quicktemplates2/qquicktextarea_p.h b/src/quicktemplates2/qquicktextarea_p.h
index 3d0e5040..571b91c6 100644
--- a/src/quicktemplates2/qquicktextarea_p.h
+++ b/src/quicktemplates2/qquicktextarea_p.h
@@ -97,6 +97,7 @@ Q_SIGNALS:
 
 protected:
     void classBegin() override;
+    void componentComplete() override;
 
     void itemChange(ItemChange change, const ItemChangeData &value) override;
     void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
diff --git a/src/quicktemplates2/qquicktextfield.cpp b/src/quicktemplates2/qquicktextfield.cpp
index 551faf9e..bcbb7f1b 100644
--- a/src/quicktemplates2/qquicktextfield.cpp
+++ b/src/quicktemplates2/qquicktextfield.cpp
@@ -353,6 +353,16 @@ void QQuickTextField::classBegin()
     d->resolveFont();
 }
 
+void QQuickTextField::componentComplete()
+{
+    Q_D(QQuickTextField);
+    QQuickTextInput::componentComplete();
+#ifndef QT_NO_ACCESSIBILITY
+    if (!d->accessibleAttached && QAccessible::isActive())
+        d->accessibilityActiveChanged(true);
+#endif
+}
+
 void QQuickTextField::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &value)
 {
     Q_D(QQuickTextField);
diff --git a/src/quicktemplates2/qquicktextfield_p.h b/src/quicktemplates2/qquicktextfield_p.h
index 976f4e69..a3bcb69c 100644
--- a/src/quicktemplates2/qquicktextfield_p.h
+++ b/src/quicktemplates2/qquicktextfield_p.h
@@ -94,6 +94,7 @@ Q_SIGNALS:
 
 protected:
     void classBegin() override;
+    void componentComplete() override;
 
     void itemChange(ItemChange change, const ItemChangeData &value) override;
     void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;