diff options
| author | Andrew den Exter <andrew.den.exter@jollamobile.com> | 2014-06-27 12:49:07 +1000 |
|---|---|---|
| committer | Robin Burchell <robin+qt@viroteck.net> | 2014-07-03 23:06:26 +0200 |
| commit | 2e75be5f64fb21cbbdff3353dbd507c2ca26946a (patch) | |
| tree | cd10f0820ae3bb2a3ef061059456fe560e4a08ed /src/qml/qml/qqmlengine.cpp | |
| parent | 8e866366e5ef3f77d19a0b9f8ca93dafd15e1e6a (diff) | |
Fix crash on QQmlEngine destruction.
QQmlTypeLoader references QQmlImportDatabase in a thread, so change the
declaration order so QQmlTypeLoader is destroyed and its thread stopped
before QQmlImportDatabase is destroyed.
Change-Id: Idfa511cf9625f893c4398f419a74d869169b478d
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Diffstat (limited to 'src/qml/qml/qqmlengine.cpp')
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 70d0c3ad40..9bf983ab85 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -560,7 +560,7 @@ QQmlEnginePrivate::QQmlEnginePrivate(QQmlEngine *e) workerScriptEngine(0), activeObjectCreator(0), networkAccessManager(0), networkAccessManagerFactory(0), urlInterceptor(0), - scarceResourcesRefCount(0), importDatabase(e), typeLoader(e), uniqueId(1), + scarceResourcesRefCount(0), typeLoader(e), importDatabase(e), uniqueId(1), incubatorCount(0), incubationController(0), mutex(QMutex::Recursive) { useNewCompiler = true; |