From 1823c1c6d75261cf0b3f247e07ac3d0c7b31f1c0 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 1 Jun 2016 10:32:20 +0200 Subject: Remove inheritance of QQmlCompiledData from QQmlCleanUp The clear() re-implementation from QQmlCleanUp was empty, so this added no functionality. Commit 19c6f620dd35916466c36234231d798f79732ab0 removed the last usage of it. Change-Id: I499a6daeb1f74cc8bad1cacc5c367fde1e6eee75 Reviewed-by: Lars Knoll --- src/qml/qml/qqmlcompileddata.cpp | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'src/qml/qml/qqmlcompileddata.cpp') diff --git a/src/qml/qml/qqmlcompileddata.cpp b/src/qml/qml/qqmlcompileddata.cpp index bd867a9b90..5344c738d8 100644 --- a/src/qml/qml/qqmlcompileddata.cpp +++ b/src/qml/qml/qqmlcompileddata.cpp @@ -62,7 +62,7 @@ QQmlCompiledData::QQmlCompiledData(QQmlEngine *engine) void QQmlCompiledData::destroy() { - if (engine && hasEngine()) + if (engine && compilationUnit && compilationUnit->engine) QQmlEnginePrivate::deleteInEngineThread(engine, this); else delete this; @@ -70,20 +70,6 @@ void QQmlCompiledData::destroy() QQmlCompiledData::~QQmlCompiledData() { - clear(); -} - -void QQmlCompiledData::clear() -{ -} - -void QQmlCompiledData::initialize(QQmlEngine *engine) -{ - Q_ASSERT(!hasEngine()); - QQmlCleanup::addToEngine(engine); - QV4::ExecutionEngine *v4 = QV8Engine::getV4(engine); - if (compilationUnit && !compilationUnit->engine) - compilationUnit->linkToEngine(v4); } QT_END_NAMESPACE -- cgit v1.2.3