Mark functions involving attached property IDs as deprecated

Task-number: QTBUG-75176
Change-Id: I969e7987ebf8b98aed9ba9e17388a0e168ef5e09
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

6 files changed, 20 insertions, 6 deletions

diff --git a/src/qml/qml/qqml.h b/src/qml/qml/qqml.h
index 82dc8d0c1b..7b3f89e943 100644
--- a/src/qml/qml/qqml.h
+++ b/src/qml/qml/qqml.h
@@ -579,9 +579,11 @@ namespace QtQml {
     Q_QML_EXPORT void qmlExecuteDeferred(QObject *);
     Q_QML_EXPORT QQmlContext *qmlContext(const QObject *);
     Q_QML_EXPORT QQmlEngine *qmlEngine(const QObject *);
-    Q_QML_EXPORT QObject *qmlAttachedPropertiesObjectById(int, const QObject *, bool create = true);
-    Q_QML_EXPORT QObject *qmlAttachedPropertiesObject(int *, const QObject *,
-                                                      const QMetaObject *, bool create);
+#if QT_DEPRECATED_SINCE(5, 14)
+    Q_QML_EXPORT QT_DEPRECATED QObject *qmlAttachedPropertiesObjectById(int, const QObject *, bool create = true);
+    Q_QML_EXPORT QT_DEPRECATED QObject *qmlAttachedPropertiesObject(
+            int *, const QObject *, const QMetaObject *, bool create);
+#endif
     Q_QML_EXPORT QQmlAttachedPropertiesFunc qmlAttachedPropertiesFunction(QObject *,
                                                                           const QMetaObject *);
     Q_QML_EXPORT QObject *qmlAttachedPropertiesObject(QObject *, QQmlAttachedPropertiesFunc func,
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index 19c3469682..bb2b3e462c 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -1625,6 +1625,7 @@ static QObject *resolveAttachedProperties(QQmlAttachedPropertiesFunc pf, QQmlDat
     return rv;
 }
 
+#if QT_DEPRECATED_SINCE(5, 14)
 QObject *qmlAttachedPropertiesObjectById(int id, const QObject *object, bool create)
 {
     QQmlData *data = QQmlData::get(object, create);
@@ -1652,6 +1653,7 @@ QObject *qmlAttachedPropertiesObject(int *idCache, const QObject *object,
 
     return qmlAttachedPropertiesObjectById(*idCache, object, create);
 }
+#endif
 
 QQmlAttachedPropertiesFunc qmlAttachedPropertiesFunction(QObject *object,
                                                          const QMetaObject *attachedMetaObject)
diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp
index 01da5923d9..09df23de51 100644
--- a/src/qml/qml/qqmlmetatype.cpp
+++ b/src/qml/qml/qqmlmetatype.cpp
@@ -899,6 +899,7 @@ int QQmlMetaType::listType(int id)
         return 0;
 }
 
+#if QT_DEPRECATED_SINCE(5, 14)
 int QQmlMetaType::attachedPropertiesFuncId(QQmlEnginePrivate *engine, const QMetaObject *mo)
 {
     QQmlMetaTypeDataPtr data;
@@ -920,6 +921,7 @@ QQmlAttachedPropertiesFunc QQmlMetaType::attachedPropertiesFuncById(QQmlEnginePr
     QQmlMetaTypeDataPtr data;
     return data->types.at(id).attachedPropertiesFunction(engine);
 }
+#endif
 
 QQmlAttachedPropertiesFunc QQmlMetaType::attachedPropertiesFunc(QQmlEnginePrivate *engine,
                                                                 const QMetaObject *mo)
diff --git a/src/qml/qml/qqmlmetatype_p.h b/src/qml/qml/qqmlmetatype_p.h
index b7304cfa63..9af982d1c3 100644
--- a/src/qml/qml/qqmlmetatype_p.h
+++ b/src/qml/qml/qqmlmetatype_p.h
@@ -119,8 +119,12 @@ public:
     static QObject *toQObject(const QVariant &, bool *ok = nullptr);
 
     static int listType(int);
-    static int attachedPropertiesFuncId(QQmlEnginePrivate *engine, const QMetaObject *);
-    static QQmlAttachedPropertiesFunc attachedPropertiesFuncById(QQmlEnginePrivate *, int);
+#if QT_DEPRECATED_SINCE(5, 14)
+    static QT_DEPRECATED int attachedPropertiesFuncId(QQmlEnginePrivate *engine,
+                                                      const QMetaObject *);
+    static QT_DEPRECATED QQmlAttachedPropertiesFunc attachedPropertiesFuncById(QQmlEnginePrivate *,
+                                                                               int);
+#endif
     static QQmlAttachedPropertiesFunc attachedPropertiesFunc(QQmlEnginePrivate *,
                                                              const QMetaObject *);
 
diff --git a/src/qml/qml/qqmltype.cpp b/src/qml/qml/qqmltype.cpp
index 26ca995756..926e2810d5 100644
--- a/src/qml/qml/qqmltype.cpp
+++ b/src/qml/qml/qqmltype.cpp
@@ -650,6 +650,7 @@ const QMetaObject *QQmlType::attachedPropertiesType(QQmlEnginePrivate *engine) c
     return base.attachedPropertiesType(engine);
 }
 
+#if QT_DEPRECATED_SINCE(5, 14)
 /*
 This is the id passed to qmlAttachedPropertiesById().  This is different from the index
 for the case that a single class is registered under two or more names (eg. Item in
@@ -667,6 +668,7 @@ int QQmlType::attachedPropertiesId(QQmlEnginePrivate *engine) const
         base = resolveCompositeBaseType(engine);
     return base.attachedPropertiesId(engine);
 }
+#endif
 
 int QQmlType::parserStatusCast() const
 {
diff --git a/src/qml/qml/qqmltype_p.h b/src/qml/qml/qqmltype_p.h
index 7b326ce1c7..1d65a08c8f 100644
--- a/src/qml/qml/qqmltype_p.h
+++ b/src/qml/qml/qqmltype_p.h
@@ -131,7 +131,9 @@ public:
 
     QQmlAttachedPropertiesFunc attachedPropertiesFunction(QQmlEnginePrivate *engine) const;
     const QMetaObject *attachedPropertiesType(QQmlEnginePrivate *engine) const;
-    int attachedPropertiesId(QQmlEnginePrivate *engine) const;
+#if QT_DEPRECATED_SINCE(5, 14)
+    QT_DEPRECATED int attachedPropertiesId(QQmlEnginePrivate *engine) const;
+#endif
 
     int parserStatusCast() const;
     const char *interfaceIId() const;