From f9af480ed2b10a1fd6b692befbebcbecb9e1f429 Mon Sep 17 00:00:00 2001 From: Rami Potinkara Date: Mon, 19 May 2025 10:19:38 +0300 Subject: [PATCH] Android: update clang compiler detection This patch updates the clang compiler detection to allow Clang version 2010 and above to use C++26 macros. This will allow Qt Android x86_64 build on dev to compile. Fixes: QTBUG-136968 Pick-to: 6.9 Change-Id: I0988169e6e10357f0e210c3911843e6d04a43c0d Reviewed-by: Giuseppe D'Angelo --- src/corelib/global/qcompilerdetection.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 3aab6ec30b0..700c59ab3c7 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -1035,7 +1035,7 @@ // 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) || Q_CC_CLANG_ONLY >= 2000 || __cplusplus > 202302L) // C++26 + && (!defined(Q_CC_CLANG_ONLY) || Q_CC_CLANG_ONLY >= 2010 || __cplusplus > 202302L) // C++26 # define Q_DECL_EQ_DELETE_X(reason) = delete(reason) # else # define Q_DECL_EQ_DELETE_X(reason) = delete