From 36fa489cb8e078b6b0c45647a4bef7260d78d7fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20S=C3=B8rvig?= Date: Tue, 24 May 2022 14:44:57 +0200 Subject: wasm: remove message handler lock MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We have now upgraded the minimum emsdk to one where Emscripten properly synchronizes stdout/stderr output. Pick-to: 6.4 Change-Id: I537897b31916a52303a3fdb1d255f03b4aeaffef Reviewed-by: Morten Johan Sørvig --- src/corelib/global/qlogging.cpp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src/corelib/global/qlogging.cpp') diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp index 4a80b1c5c6..94ec78f382 100644 --- a/src/corelib/global/qlogging.cpp +++ b/src/corelib/global/qlogging.cpp @@ -1789,13 +1789,6 @@ static void stderr_message_handler(QtMsgType type, const QMessageLogContext &con if (formattedMessage.isNull()) return; -#ifdef Q_OS_WASM - // Prevent thread cross-talk, which causes Emscripten to log - // non-valid UTF-8. FIXME: remove once we upgrade to emsdk > 2.0.30 - Q_CONSTINIT static QBasicMutex m; - auto locker = qt_unique_lock(m); -#endif - fprintf(stderr, "%s\n", formattedMessage.toLocal8Bit().constData()); fflush(stderr); } -- cgit v1.2.3