From 80762373eab050853ea61d7336d4d14865fd1d8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Thu, 13 Oct 2022 15:23:39 +0200 Subject: [PATCH] Update QMutex-noexceptedness Platforms where we use futex do not allocate. Windows gained support in 6.2, but the noexcept macro was missed. Amends 91f6460aff0a6ab5142f16d5f4fc1f559ca1c325 Change-Id: I76da48fbaac5749fdec4ec76de6a0ff891b78442 Reviewed-by: Marc Mutz Reviewed-by: Thiago Macieira --- src/corelib/thread/qmutex.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/thread/qmutex.h b/src/corelib/thread/qmutex.h index ce7b5275ac2..ab531ef70e9 100644 --- a/src/corelib/thread/qmutex.h +++ b/src/corelib/thread/qmutex.h @@ -19,7 +19,7 @@ QT_BEGIN_NAMESPACE #if QT_CONFIG(thread) || defined(Q_CLANG_QDOC) -#ifdef Q_OS_LINUX +#if defined(Q_OS_LINUX) || defined(Q_OS_WIN) // these platforms use futex # define QT_MUTEX_LOCK_NOEXCEPT noexcept #else # define QT_MUTEX_LOCK_NOEXCEPT