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

Fix QMetaType::typeName returning wrong result for clang-cl

Browse Source 
Change-Id: I94fa1d56d98b8caae514b37fbf6432985195d827
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit d49f5752a560d7c8fec99c57bbfb192a9be1b296)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexander Neumann 2022-02-20 10:12:43 +01:00 committed by Qt Cherry-pick Bot
parent af02854585
commit 81b1241791
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/kernel/qmetatype.h
View File

@ -2136,7 +2136,9 @@ constexpr auto typenameHelper()
#ifdef QT_NAMESPACE
QT_STRINGIFY(QT_NAMESPACE) "::"
#endif
#ifdef Q_CC_MSVC
#if defined(Q_CC_MSVC) && defined(Q_CC_CLANG)
"auto __cdecl QtPrivate::typenameHelper(void) [T = "
#elif defined(Q_CC_MSVC)
"auto __cdecl QtPrivate::typenameHelper<"
#elif defined(Q_CC_CLANG)
"auto QtPrivate::typenameHelper() [T = "
@ -2146,7 +2148,7 @@ constexpr auto typenameHelper()
"constexpr auto QtPrivate::typenameHelper() [with T = "
#endif
) - 1;
#ifdef Q_CC_MSVC
#if defined(Q_CC_MSVC) && !defined(Q_CC_CLANG)
constexpr int suffix = sizeof(">(void)");
#else
constexpr int suffix = sizeof("]");