diff options
| author | Kimmo Ollila <kimmo.ollila@qt.io> | 2021-01-22 11:24:00 +0200 |
|---|---|---|
| committer | Kimmo Ollila <kimmo.ollila@qt.io> | 2021-01-25 08:37:06 +0200 |
| commit | 77cfbd755af6a76491bfccd1a19d7ca266d57d93 (patch) | |
| tree | 3243d06ecf6c4589dd2a45c91aada0c88cd40db0 /src/corelib | |
| parent | 1a9095e1fa4bb5d74b91d1661d55893d0e8620e1 (diff) | |
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 <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index e45c40c372..cd9b6ad6c6 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<T>() [with T = " #else "constexpr auto QtPrivate::typenameHelper() [with T = " #endif |