From 31d84ed73994b229eef62bebf225941c6788f724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Thu, 22 May 2025 15:59:35 +0200 Subject: [PATCH] qt_noop is not defined in the qt-namespace Causes compilation errors when qt_noop is used, like from QT_THROW when compiling without exceptions. Amends 88f2d7aacb17119aebc701fbf10f9c89d4e9b79a Fixes: QTBUG-137104 Change-Id: I377e278bd6a1b5a4a3b5a58d52d5205fb9545ec5 Reviewed-by: Thiago Macieira --- src/corelib/global/qassert.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/global/qassert.h b/src/corelib/global/qassert.h index 0852f79258f..31dca092694 100644 --- a/src/corelib/global/qassert.h +++ b/src/corelib/global/qassert.h @@ -64,7 +64,7 @@ Q_CORE_EXPORT void qBadAlloc(); #ifdef QT_NO_EXCEPTIONS # if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS) -# define Q_CHECK_PTR(p) QT_PREPEND_NAMESPACE(qt_noop)() +# define Q_CHECK_PTR(p) qt_noop() # else # define Q_CHECK_PTR(p) do {if (!(p)) QT_PREPEND_NAMESPACE(qt_check_pointer)(__FILE__,__LINE__);} while (false) # endif