From 72d6b897a488a8952bb29de824d9dc484183c865 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 2 May 2022 09:49:40 -0700 Subject: [PATCH] QLibraryInfo: Use __VERSION__ with Clang too Regular Clang: "Clang 14.0.3" Apple Clang: "Apple LLVM 13.1.6 (clang-1316.0.21.2.3)" Intel oneAPI DPC++: "Intel(R) oneAPI DPC++/C++ Compiler 2022.0.0 (2022.0.0.20211123)" Change-Id: I5ff8e16fcdcb4ffd9ab6fffd16eb57c2673d3030 Reviewed-by: Marc Mutz --- src/corelib/global/qlibraryinfo.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 353d4bdf95..64fb99cf8a 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -208,11 +208,7 @@ QLibraryInfo::QLibraryInfo() { } #if defined(Q_CC_CLANG) // must be before GNU, because clang claims to be GNU too -# ifdef __apple_build_version__ // Apple clang has other version numbers -# define COMPILER_STRING "Clang " __clang_version__ " (Apple)" -# else -# define COMPILER_STRING "Clang " __clang_version__ -# endif +# define COMPILER_STRING __VERSION__ /* already includes the compiler's name */ #elif defined(Q_CC_GHS) # define COMPILER_STRING "GHS " QT_STRINGIFY(__GHS_VERSION_NUMBER) #elif defined(Q_CC_GNU)