diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2016-05-13 14:58:44 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-05-13 14:00:59 +0000 |
| commit | 48888e9462a151aa22d4a1ec0a58d4746dbe50fb (patch) | |
| tree | 4108c9d345ad2b99aa4b72c395706d7e414e87c1 | |
| parent | fc9ede8246ed5cadcf9f303fc762bd6b9adc58a9 (diff) | |
QML: Fix asynchronous cached loading.
When calling CachedLoader::loadAsync, queue the load on the QML thread
instead of asking the thread to load it synchronously. The problem
showed when a QML file triggered a plugin load, that would ask the
engine to create a component while initializing that plugin.
Change-Id: I3714ef285e432eb1aa294c4fd0208ba188d97ee9
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| -rw-r--r-- | src/qml/qml/qqmltypeloader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp index 0e0efcf753..c684c8602e 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -958,7 +958,7 @@ struct CachedLoader { } void loadAsync(QQmlTypeLoader *loader, QQmlDataBlob *blob) const { - loader->m_thread->loadWithCachedUnit(blob, unit); + loader->m_thread->loadWithCachedUnitAsync(blob, unit); } }; |