diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-22 01:00:07 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-04-23 09:53:31 +0200 |
| commit | 0cf8e2fb974370fd6d370f92fa22fa2245bcebb0 (patch) | |
| tree | f7b471bd8abb111e32a220bca24bd508b7871cca /src/qml/qml/qqmlmetatype_p.h | |
| parent | c00283bb3bb966bf60c307ec8283bd98c12318bf (diff) | |
| parent | 53bd6b8111eb0d7f23b3b0ca95bef4735f7a952c (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/qml/qml/qqmlmetatype.cpp
Change-Id: Ieff61c076e46eb50a059c8b0210f7f4d7ce0cbcf
Diffstat (limited to 'src/qml/qml/qqmlmetatype_p.h')
| -rw-r--r-- | src/qml/qml/qqmlmetatype_p.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlmetatype_p.h b/src/qml/qml/qqmlmetatype_p.h index dde9cf68d7..b7304cfa63 100644 --- a/src/qml/qml/qqmlmetatype_p.h +++ b/src/qml/qml/qqmlmetatype_p.h @@ -88,9 +88,6 @@ public: static void registerUndeletableType(const QQmlType &dtype); - static int registerAttachedPropertyId(const QMetaObject *metaObject, int index); - static bool unregisterAttachedPropertyId(const QMetaObject *metaObject, int index); - static QList<QString> qmlTypeNames(); static QList<QQmlType> qmlTypes(); static QList<QQmlType> qmlSingletonTypes(); @@ -124,6 +121,8 @@ public: static int listType(int); static int attachedPropertiesFuncId(QQmlEnginePrivate *engine, const QMetaObject *); static QQmlAttachedPropertiesFunc attachedPropertiesFuncById(QQmlEnginePrivate *, int); + static QQmlAttachedPropertiesFunc attachedPropertiesFunc(QQmlEnginePrivate *, + const QMetaObject *); enum TypeCategory { Unknown, Object, List }; static TypeCategory typeCategory(int); |