diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@digia.com> | 2012-09-21 15:28:01 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-27 09:52:04 +0200 |
| commit | a49154a75005403185e3813d441fb3e1931af2a2 (patch) | |
| tree | e238ec95b2b6da0489f2d910cb2cfdd1555d422a /src | |
| parent | ac475a334466f6e369d6eb68e122c0f952828c43 (diff) | |
Update qMetaType helpers usage.
QtDeclarative is using private meta type api to register custom types,
but the helper functions were updated to a new signature.
Change-Id: I467b283b5b1ccdad8ebd1a2bb651e8ad59b9c55d
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
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)); |