Compile Private API autotests for INTEGRITY

- GHS's __PRETTY_FUNCTION__ (used by QT as Q_FUNC_INFO) doesn't have spaces
  round the = operator when indicating the type of the template parameter.

 The compilation error:
 qt5/qtbase/src/corelib/kernel/qmetatype.h", line 2104: note #3316-D:
 cannot access position 53 in array of 49 elements
 constexpr const char *begin = func + prefix;
                                             ^
   detected during:
     instantiation of
     "auto QtPrivate::typenameHelper<T>() [with T=void]" at
       line 2186


Task-number: QTBUG-97087
Pick-to: 6.2
Change-Id: I33e61f5d54a61944a5aecf07d149a8dee0ef1e5d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Tatiana Borisova 2021-10-13 14:29:36 +03:00
parent 3f4082c0e8
commit 57ec47921e
2 changed files with 2 additions and 4 deletions

View File

@ -2154,7 +2154,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

View File

@ -23,9 +23,7 @@ if(TARGET Qt::Network)
add_subdirectory(qeventloop)
endif()
if(TARGET Qt::Gui)
if(NOT INTEGRITY)
add_subdirectory(qmetatype)
endif()
add_subdirectory(qmetatype)
add_subdirectory(qmimedata)
add_subdirectory(qvariant)
endif()