diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-05-29 18:58:07 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-05-31 14:29:11 +0000 |
| commit | 06467a192b7b107987b2d2d030a32a36ffbece5f (patch) | |
| tree | 0de7a7e6b5bc7df282613324a0580073510265e5 /src/qml/qml/qqmlcompileddata.cpp | |
| parent | 2bb309af8b2e32bd34644bed363f5880c50221af (diff) | |
Moved meta-type id members to QV4::CompiledData::CompilationUnit
Change-Id: I808d0a36094e873b69cf24a5b0113e741ff2a25d
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/qml/qml/qqmlcompileddata.cpp')
| -rw-r--r-- | src/qml/qml/qqmlcompileddata.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlcompileddata.cpp b/src/qml/qml/qqmlcompileddata.cpp index fad13bb1e3..bd867a9b90 100644 --- a/src/qml/qml/qqmlcompileddata.cpp +++ b/src/qml/qml/qqmlcompileddata.cpp @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE QQmlCompiledData::QQmlCompiledData(QQmlEngine *engine) -: engine(engine), metaTypeId(-1), listMetaTypeId(-1), isRegisteredWithEngine(false) +: engine(engine) { Q_ASSERT(engine); } @@ -70,9 +70,6 @@ void QQmlCompiledData::destroy() QQmlCompiledData::~QQmlCompiledData() { - if (isRegisteredWithEngine) - QQmlEnginePrivate::get(engine)->unregisterInternalCompositeType(this); - clear(); } |