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/qqmlobjectcreator.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/qml/qml/qqmlobjectcreator.cpp') diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp index e2e1c6878e..546bc1d81e 100644 --- a/src/qml/qml/qqmlobjectcreator.cpp +++ b/src/qml/qml/qqmlobjectcreator.cpp @@ -112,8 +112,8 @@ void QQmlObjectCreator::init(QQmlContextData *providedParentContext) engine = parentContext->engine; v4 = QV8Engine::getV4(engine); - if (!compiledData->isInitialized()) - compiledData->initialize(engine); + if (compiledData->compilationUnit && !compiledData->compilationUnit->engine) + compiledData->compilationUnit->linkToEngine(v4); qmlUnit = compiledData->compilationUnit->data; context = 0; -- cgit v1.2.3