diff options
Diffstat (limited to 'src/qml/qml/qqmlprivate.h')
-rw-r--r-- | src/qml/qml/qqmlprivate.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/qml/qml/qqmlprivate.h b/src/qml/qml/qqmlprivate.h index eeb5b4c302..fabdcacc36 100644 --- a/src/qml/qml/qqmlprivate.h +++ b/src/qml/qml/qqmlprivate.h @@ -69,7 +69,6 @@ namespace CompiledData { struct Unit; struct CompilationUnit; } -typedef CompiledData::CompilationUnit *(*CompilationUnitFactoryFunction)(); } namespace QmlIR { struct Document; @@ -99,7 +98,7 @@ namespace QQmlPrivate class QQmlElement : public T { public: - virtual ~QQmlElement() { + ~QQmlElement() override { QQmlPrivate::qdeclarativeelement_destructor(this); } }; @@ -168,8 +167,8 @@ namespace QQmlPrivate class AttachedPropertySelector { public: - static inline QQmlAttachedPropertiesFunc func() { return 0; } - static inline const QMetaObject *metaObject() { return 0; } + static inline QQmlAttachedPropertiesFunc func() { return nullptr; } + static inline const QMetaObject *metaObject() { return nullptr; } }; template<typename T> class AttachedPropertySelector<T, 1> @@ -284,8 +283,8 @@ namespace QQmlPrivate struct CachedQmlUnit { const QV4::CompiledData::Unit *qmlData; - QV4::CompilationUnitFactoryFunction createCompilationUnit; - QmlIR::IRLoaderFunction loadIR; + void *unused1; + void *unused2; }; typedef const CachedQmlUnit *(*QmlUnitCacheLookupFunction)(const QUrl &url); |