From a62637358f23546a9edef397fd4d5869a16f0645 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Tue, 12 Jun 2018 18:24:56 +1000 Subject: wasm: fix assert crash in debug mode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ieb72f57bc75465e938538dd6079f43ba49cbed3c Reviewed-by: Morten Johan Sørvig --- src/qml/qml/qqmltypeloader.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src') diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp index 1936030666..70ef3d82ff 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -860,12 +860,22 @@ void QQmlTypeLoaderThread::loadWithCachedUnitAsync(QQmlDataBlob *b, const QV4::C void QQmlTypeLoaderThread::callCompleted(QQmlDataBlob *b) { b->addref(); +#ifdef QT_NO_THREAD + if (!isThisThread()) + postMethodToThread(&This::callCompletedMain, b); + return; +#endif postMethodToMain(&This::callCompletedMain, b); } void QQmlTypeLoaderThread::callDownloadProgressChanged(QQmlDataBlob *b, qreal p) { b->addref(); +#ifdef QT_NO_THREAD + if (!isThisThread()) + postMethodToThread(&This::callDownloadProgressChangedMain, b, p); + return; +#endif postMethodToMain(&This::callDownloadProgressChangedMain, b, p); } -- cgit v1.2.3