1 files changed, 12 insertions, 12 deletions
diff --git a/src/quicktemplates2/qquicktextarea_p_p.h b/src/quicktemplates2/qquicktextarea_p_p.h
index 85afd226..ef2c7237 100644
--- a/src/quicktemplates2/qquicktextarea_p_p.h
+++ b/src/quicktemplates2/qquicktextarea_p_p.h
@@ -54,7 +54,7 @@
 
 #include "qquicktextarea_p.h"
 
-#ifndef QT_NO_ACCESSIBILITY
+#if QT_CONFIG(accessibility)
 #include <QtGui/qaccessible.h>
 #endif
 
@@ -64,7 +64,7 @@ class QQuickFlickable;
 class QQuickAccessibleAttached;
 
 class QQuickTextAreaPrivate : public QQuickTextEditPrivate, public QQuickItemChangeListener
-#ifndef QT_NO_ACCESSIBILITY
+#if QT_CONFIG(accessibility)
     , public QAccessible::ActivationObserver
 #endif
 {
@@ -74,14 +74,18 @@ public:
     QQuickTextAreaPrivate();
     ~QQuickTextAreaPrivate();
 
-    static QQuickTextAreaPrivate *get(QQuickTextArea *item) {
-        return static_cast<QQuickTextAreaPrivate *>(QObjectPrivate::get(item)); }
+    static QQuickTextAreaPrivate *get(QQuickTextArea *item)
+    {
+        return static_cast<QQuickTextAreaPrivate *>(QObjectPrivate::get(item));
+    }
 
     void resizeBackground();
     void resolveFont();
     void inheritFont(const QFont &f);
 
+#if QT_CONFIG(quicktemplates2_hover)
     void updateHoverEnabled(bool h, bool e);
+#endif
 
     void attachFlickable(QQuickFlickable *flickable);
     void detachFlickable();
@@ -97,17 +101,17 @@ public:
     void implicitWidthChanged() override;
     void implicitHeightChanged() override;
 
-    void _q_readOnlyChanged(bool isReadOnly);
+    void readOnlyChanged(bool isReadOnly);
 
-#ifndef QT_NO_ACCESSIBILITY
+#if QT_CONFIG(accessibility)
     void accessibilityActiveChanged(bool active) override;
     QAccessible::Role accessibleRole() const override;
 #endif
 
-    void deleteDelegate(QObject *object);
-
+#if QT_CONFIG(quicktemplates2_hover)
     bool hovered;
     bool explicitHoverEnabled;
+#endif
     QFont font;
     QQuickItem *background;
     QString placeholder;
@@ -115,10 +119,6 @@ public:
     QQuickPressHandler pressHandler;
     QQuickAccessibleAttached *accessibleAttached;
     QQuickFlickable *flickable;
-    // This list contains the default delegates which were
-    // replaced with custom ones via declarative assignments
-    // before Component.completed() was emitted. See QTBUG-50992.
-    QVector<QObject *> pendingDeletions;
 };
 
 QT_END_NAMESPACE