diff options
author | Robert Griebl <robert.griebl@pelagicore.com> | 2015-06-17 16:38:47 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-23 17:31:51 +0000 |
commit | 1b4f94c8fe0452cc053907fea2ad8be3930df8ce (patch) | |
tree | 3c65361cdeb08ce764979b8e35604f4a84c8f909 /src/qml/qml/ftw/qqmlthread_p.h | |
parent | fcbefee383ccff2a6485acc120631123e30b41dd (diff) |
Force completion of asynchronously loaded components.
[ChangeLog][QtQuick][QQmlComponent] Synchronously complete the loading of a
Asynchronous QQmlComponent, if a PreferSynchronous QQmlComponent is created
for the same url (given that this url does support synchronous loading).
Change-Id: I3291d0569a69bac2aeb4815f1068a426ef2707ef
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/qml/ftw/qqmlthread_p.h')
-rw-r--r-- | src/qml/qml/ftw/qqmlthread_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/qml/ftw/qqmlthread_p.h b/src/qml/qml/ftw/qqmlthread_p.h index 86d7d2cf19..73658536ac 100644 --- a/src/qml/qml/ftw/qqmlthread_p.h +++ b/src/qml/qml/ftw/qqmlthread_p.h @@ -108,6 +108,8 @@ public: template<typename T, typename T2, class V, class V2, class O> inline void postMethodToMain(void (O::*Member)(V, V2), const T &, const T2 &); + void waitForNextMessage(); + protected: virtual void startupThread(); virtual void shutdownThread(); |