diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-03-06 16:55:09 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-07 15:33:19 +0100 |
| commit | 99efe4309379482fce5c231885883e359bf85290 (patch) | |
| tree | dbb9333a547fa1939bd63bd64136611e9fe82968 /src/qml/qml/qqmlengine.cpp | |
| parent | 9fc17c08e5635cf112c6194e6c24af2a9c7caf00 (diff) | |
Remove old compiler and VME
This removes the bulk of the code. A few smaller cleanups remain, to be
done in smaller changes as they move code around.
Additionally the "optimize" option of qqmlbundle was removed. It called QQmlScript::Parser::preparseData,
which however was not implemented and always returned an empty QByteArray. Therefore "optimize" would not
do anything and the class is gone now :)
Change-Id: I0c265e756704cb53c5250be1f69e4a3e1b6e64d5
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlengine.cpp')
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index c344c3e069..72de9845c8 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -556,7 +556,7 @@ QQmlEnginePrivate::QQmlEnginePrivate(QQmlEngine *e) : propertyCapture(0), rootContext(0), isDebugging(false), profiler(0), outputWarningsToStdErr(true), cleanup(0), erroredBindings(0), inProgressCreations(0), - workerScriptEngine(0), activeVME(0), + workerScriptEngine(0), activeObjectCreator(0), networkAccessManager(0), networkAccessManagerFactory(0), urlInterceptor(0), scarceResourcesRefCount(0), importDatabase(e), typeLoader(e), uniqueId(1), @@ -1045,9 +1045,7 @@ QQmlNetworkAccessManagerFactory *QQmlEngine::networkAccessManagerFactory() const void QQmlEnginePrivate::registerFinalizeCallback(QObject *obj, int index) { - if (activeVME) { - activeVME->finalizeCallbacks.append(qMakePair(QPointer<QObject>(obj), index)); - } else if (activeObjectCreator) { + if (activeObjectCreator) { activeObjectCreator->finalizeCallbacks()->append(qMakePair(QPointer<QObject>(obj), index)); } else { void *args[] = { 0 }; |