summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorn Potter <lorn.potter@gmail.com>2018-06-20 18:09:32 +1000
committerLorn Potter <lorn.potter@gmail.com>2018-06-20 19:30:59 +0000
commit5e23016e6d6266d5d5a82e6cf3ca7c3f7f2a6647 (patch)
tree7b8611fd094a0bb2dbbde4cf28cd5f4174c1fa34
parent2d0ecb48a8b6b6932789bf3bbeec817231a60ac7 (diff)
wasm: work around assert crash
Until something is done with mutex locks Change-Id: Id28411b542afa3ac6e11c295a0495508dbada155 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
-rw-r--r--src/corelib/mimetypes/qmimedatabase.cpp2
1 files changed, 2 insertions, 0 deletions
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<QMimeProviderBase *> 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();