diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2021-09-29 18:07:23 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2021-10-29 20:26:13 -0700 |
| commit | a887b7750cc8cb7fcc12e782eb046111f4a78902 (patch) | |
| tree | 6dedb317ad30f975af90849b0be4c8e13d2593a8 /src/corelib/tools/qoffsetstringarray_p.h | |
| parent | 388136e860c51f0d00026b8be831d562f8193704 (diff) | |
qconfig.cpp: use qOffsetStringArray
It's been there for ages, we may as well use it and remove unnecessary
complexity from CMake.
Pick-to: 6.2
Change-Id: I2bbf422288924c198645fffd16a9742567a7e4af
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Diffstat (limited to 'src/corelib/tools/qoffsetstringarray_p.h')
| -rw-r--r-- | src/corelib/tools/qoffsetstringarray_p.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h index 6e0cb1f30b..607f13d662 100644 --- a/src/corelib/tools/qoffsetstringarray_p.h +++ b/src/corelib/tools/qoffsetstringarray_p.h @@ -63,6 +63,12 @@ class tst_QOffsetStringArray; QT_BEGIN_NAMESPACE +QT_WARNING_PUSH +#if defined(Q_CC_GNU) && Q_CC_GNU >= 1100 +// we usually don't overread, but GCC has a false positive +QT_WARNING_DISABLE_GCC("-Wstringop-overread") +#endif + template <typename StaticString, typename OffsetList> class QOffsetStringArray @@ -172,6 +178,7 @@ constexpr auto qOffsetStringArray(const char (&...strings)[Nx]) noexcept return QtPrivate::qOffsetStringArray(extractString, QtPrivate::StaticString(strings)...); } +QT_WARNING_POP QT_END_NAMESPACE #endif // QOFFSETSTRINGARRAY_P_H |