From fb1824a9d669c601ebd540c9ca16a9687d7d9706 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Tue, 25 Feb 2025 11:39:36 +0100 Subject: [PATCH] Q_DECL_EQ_DELETE_X: properly version the check for Clang Clang 20 has fixed the referenced issue. Once more this shows the importance of versioning compiler-related checks... Amends 1b1ae345025d1cac953985d4cfebd20fadb6bc99. Pick-to: 6.9 Change-Id: Iea88d466883562b0130639d7c0f2f3b984acdbc2 Reviewed-by: Thiago Macieira --- src/corelib/global/qcompilerdetection.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 333c6454d5a..a5c7cf4a912 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -1016,11 +1016,11 @@ #endif #ifndef Q_DECL_EQ_DELETE_X -// Clang advertises the feature-testing macro but issues a warning +// Clang < 20 advertises the feature-testing macro but issues a warning // if one isn't also using C++26, // https://github.com/llvm/llvm-project/issues/109311 # if defined(__cpp_deleted_function) && __cpp_deleted_function >= 202403L \ - && (!defined(Q_CC_CLANG_ONLY) || __cplusplus > 202302L) // C++26 + && (!defined(Q_CC_CLANG_ONLY) || Q_CC_CLANG_ONLY >= 2000 || __cplusplus > 202302L) // C++26 # define Q_DECL_EQ_DELETE_X(reason) = delete(reason) # else # define Q_DECL_EQ_DELETE_X(reason) = delete