diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2014-10-23 16:51:41 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2014-10-23 20:17:50 +0200 |
| commit | 174e998e4ef59f422afc94ea1165802ed5552c3f (patch) | |
| tree | 23b3f68e2103da6854ca8c6d03ecb357fcde9a8c /src/qml/qml/qqmlengine_p.h | |
| parent | 6e883c535b91c55289d54aa639199ca0a4decaec (diff) | |
QmlEngine: Use separate mutex for network access manager
Creating the network access manager can involve blocking calls to DBus,
which apparently can take quite long in pathological cases. Using the
same mutex in this case like for instance registering objects can
therefore result in a freezing UI.
Mitigate this by introducing a separate mutex.
Task-number: QTBUG-41183
Change-Id: I55bd8453d8e4bbc0bda1591eb3fd48b50ca921c1
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlengine_p.h')
| -rw-r--r-- | src/qml/qml/qqmlengine_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlengine_p.h b/src/qml/qml/qqmlengine_p.h index 3a47e059ea..f19bfc84b3 100644 --- a/src/qml/qml/qqmlengine_p.h +++ b/src/qml/qml/qqmlengine_p.h @@ -260,6 +260,7 @@ public: static bool qml_debugging_enabled; + mutable QMutex networkAccessManagerMutex; mutable QMutex mutex; private: |