diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-04 15:32:50 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-04 15:32:51 +0200 |
| commit | 81077291e3ae1fe8819cf58471ee09ad66c9cad1 (patch) | |
| tree | c0e7a482affcdfa38ee9a2ec305d02b543ad25d8 /src/qml/qml/qqmlengine.cpp | |
| parent | ea045d82a3a837f83fec82462feebf2bc262f9d9 (diff) | |
| parent | 9422bb302882bfe9e3123d8f1542507c6b6577f4 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I15cb7460171b38d11d66367aeb0831ec6e3ca933
Diffstat (limited to 'src/qml/qml/qqmlengine.cpp')
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index a7fff20530..1c491ae492 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -863,9 +863,6 @@ QQmlEngine::~QQmlEngine() QList<QQmlType*> singletonTypes = QQmlMetaType::qmlSingletonTypes(); foreach (QQmlType *currType, singletonTypes) currType->singletonInstanceInfo()->destroy(this); - - if (d->incubationController) - d->incubationController->d = 0; } /*! \fn void QQmlEngine::quit() |