From 5e23016e6d6266d5d5a82e6cf3ca7c3f7f2a6647 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Wed, 20 Jun 2018 18:09:32 +1000 Subject: wasm: work around assert crash MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Until something is done with mutex locks Change-Id: Id28411b542afa3ac6e11c295a0495508dbada155 Reviewed-by: Morten Johan Sørvig --- src/corelib/mimetypes/qmimedatabase.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/corelib/mimetypes/qmimedatabase.cpp b/src/corelib/mimetypes/qmimedatabase.cpp index 68e3c8f10d..d5f8b4a71b 100644 --- a/src/corelib/mimetypes/qmimedatabase.cpp +++ b/src/corelib/mimetypes/qmimedatabase.cpp @@ -151,7 +151,9 @@ void QMimeDatabasePrivate::loadProviders() QVector QMimeDatabasePrivate::providers() { +#ifndef Q_OS_HTML5 //we dont have working mutex locks Q_ASSERT(!mutex.tryLock()); // caller should have locked mutex +#endif if (m_providers.isEmpty()) { loadProviders(); m_lastCheck.start(); -- cgit v1.2.3