qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix INTEGRITY runtime qobject issue 

- There is no space symbol in the expression evaluation by GHS compiler.
  Because of space in prefix constant, begin pointer is moved too far and
  skips 1 letter in the class name. In result, on testing stage we see:

  I/O: FAIL!  : tst_QObject::property() Compared strings are not the same
  I/O:    Actual   (property.typeName())    : ropertyObject::Alpha
  I/O:    Expected ("PropertyObject::Alpha"): PropertyObject::Alpha

Pick-to: 6.2 6.3
Change-Id: I52759860fd26b8d50df96dcc4ab0a6b005329a9f
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Tatiana Borisova 2021-12-14 17:24:27 +02:00
parent 0d91ad44a7
commit 387797e923
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2159,7 +2159,7 @@ constexpr auto typenameHelper()
#elif defined(Q_CC_CLANG)
"auto QtPrivate::typenameHelper() [T = "
#elif defined(Q_CC_GHS)
"auto QtPrivate::typenameHelper<T>() [with T="
"auto QtPrivate::typenameHelper<T>()[with T="
#else
"constexpr auto QtPrivate::typenameHelper() [with T = "
#endif