diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 9a425234c0..b4962a6b1d 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -2012,18 +2012,18 @@ void QQmlEnginePrivate::registerCompositeType(QQmlCompiledData *data) QByteArray lst = "QQmlListProperty<" + name + '>'; int ptr_type = QMetaType::registerNormalizedType(ptr, - qMetaTypeDeleteHelper<QObject*>, - qMetaTypeCreateHelper<QObject*>, - qMetaTypeDestructHelper<QObject*>, - qMetaTypeConstructHelper<QObject*>, + QtMetaTypePrivate::QMetaTypeFunctionHelper<QObject*>::Delete, + QtMetaTypePrivate::QMetaTypeFunctionHelper<QObject*>::Create, + QtMetaTypePrivate::QMetaTypeFunctionHelper<QObject*>::Destruct, + QtMetaTypePrivate::QMetaTypeFunctionHelper<QObject*>::Construct, sizeof(QObject*), static_cast<QFlags<QMetaType::TypeFlag> >(QtPrivate::QMetaTypeTypeFlags<QObject*>::Flags), 0); int lst_type = QMetaType::registerNormalizedType(lst, - qMetaTypeDeleteHelper<QQmlListProperty<QObject> >, - qMetaTypeCreateHelper<QQmlListProperty<QObject> >, - qMetaTypeDestructHelper<QQmlListProperty<QObject> >, - qMetaTypeConstructHelper<QQmlListProperty<QObject> >, + QtMetaTypePrivate::QMetaTypeFunctionHelper<QQmlListProperty<QObject> >::Delete, + QtMetaTypePrivate::QMetaTypeFunctionHelper<QQmlListProperty<QObject> >::Create, + QtMetaTypePrivate::QMetaTypeFunctionHelper<QQmlListProperty<QObject> >::Destruct, + QtMetaTypePrivate::QMetaTypeFunctionHelper<QQmlListProperty<QObject> >::Construct, sizeof(QQmlListProperty<QObject>), static_cast<QFlags<QMetaType::TypeFlag> >(QtPrivate::QMetaTypeTypeFlags<QQmlListProperty<QObject> >::Flags), static_cast<QMetaObject*>(0)); |