1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: update clang compiler detection

Browse Source 
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
Change-Id: I0988169e6e10357f0e210c3911843e6d04a43c0d
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
(cherry picked from commit f9af480ed2b10a1fd6b692befbebcbecb9e1f429)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Rami Potinkara 2025-05-19 10:19:38 +03:00 committed by Qt Cherry-pick Bot
parent afaef97237
commit ebb1216999
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/global/qcompilerdetection.h
View File

@ -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