From 77cfbd755af6a76491bfccd1a19d7ca266d57d93 Mon Sep 17 00:00:00 2001 From: Kimmo Ollila Date: Fri, 22 Jan 2021 11:24:00 +0200 Subject: [PATCH] Add correct prefix for GHS compiler This fixes INTEGRITY build error: cannot access position 53 in array of 49 elements constexpr const char *begin = func + prefix; and many "expression must have a constant value" errors. Change-Id: I0e043028fbcb479c6657b59ea144b4536cc65651 Reviewed-by: Thiago Macieira --- src/corelib/kernel/qmetatype.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index e45c40c3726..cd9b6ad6c66 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -2083,6 +2083,8 @@ constexpr auto typenameHelper() "auto __cdecl QtPrivate::typenameHelper<" #elif defined(Q_CC_CLANG) "auto QtPrivate::typenameHelper() [T = " +#elif defined(Q_CC_GHS) + "auto QtPrivate::typenameHelper() [with T = " #else "constexpr auto QtPrivate::typenameHelper() [with T = " #endif