diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-06-01 10:32:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-06-01 10:35:16 +0000 |
| commit | 1823c1c6d75261cf0b3f247e07ac3d0c7b31f1c0 (patch) | |
| tree | d2a75b876f0fd5a3d6e6282a6c230a22f541f1f6 /src/qml/qml/qqmlcompileddata.cpp | |
| parent | 6e86846c9a1438a2ed359292ffa0d4ae70593cd2 (diff) | |
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 <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/qml/qml/qqmlcompileddata.cpp')
| -rw-r--r-- | src/qml/qml/qqmlcompileddata.cpp | 16 |
1 files changed, 1 insertions, 15 deletions
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 |