From a126b9be890be123a46e834bfe6743d72dee935d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Wed, 8 Sep 2021 13:52:10 +0300 Subject: normalizeTypeFromSignature: Update for Clang 13 Clang 13 now outputs "unnamed struct" just like GCC, while it earlier used to output "anonymous struct" (since https://reviews.llvm.org/D96807). Therefore, for Q_CC_CLANG check for both "anonymous" and "unnamed". This fixes the QMetaType testcase when built with Clang 13. Change-Id: I34de8c2ca05c0e691fbb990b001f011b0f336dc3 Reviewed-by: Ulf Hermann Reviewed-by: Thiago Macieira --- src/corelib/kernel/qmetatype.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/corelib/kernel/qmetatype.h') diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 6611e34c33..9d4d7d3c88 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -1935,10 +1935,9 @@ public: #if defined (Q_CC_CLANG) if (name.find("anonymous ") != std::string_view::npos) return normalizeType(begin, end); -#else +#endif if (name.find("unnamed ") != std::string_view::npos) return normalizeType(begin, end); -#endif while (begin < end) { if (*begin == ' ') { if (last == ',' || last == '>' || last == '<' || last == '*' || last == '&') { -- cgit v1.2.3