From cb1004f94a175b3ffc93ca9627074e2aaff31f1a Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@qt.io>
Date: Wed, 7 Oct 2020 19:42:31 +0200
Subject: [PATCH] Disable spurious warning with gcc 9.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

gcc 9.3 gives a warning when compiling with -O2:
‘strlen’ argument missing terminating nul [-Werror=stringop-overflow=]

This seems to be caused by a gcc bug that is not present in gcc 8
and fixed in gcc 10:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91490

Change-Id: Ice3c18efb7a41097521ecee22d060f175083c579
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
---
 src/corelib/tools/qoffsetstringarray_p.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h
index 72df8f1737..f99e6b800b 100644
--- a/src/corelib/tools/qoffsetstringarray_p.h
+++ b/src/corelib/tools/qoffsetstringarray_p.h
@@ -135,6 +135,10 @@ constexpr StaticString<Sum> staticString(const char (&s)[I], const char (&...sx)
 QT_WARNING_POP
 } // namespace QtPrivate
 
+QT_WARNING_PUSH
+#if defined(Q_CC_GNU) && __GNUC__ == 9
+QT_WARNING_DISABLE_GCC("-Wstringop-overflow")
+#endif
 template<typename T, int SizeString, int SizeOffsets>
 class QOffsetStringArray
 {
@@ -169,6 +173,7 @@ private:
     QtPrivate::StaticString<SizeString> m_string;
     const T m_offsets[SizeOffsets];
 };
+QT_WARNING_POP
 
 template<typename T, int N, int ... Ox>
 constexpr QOffsetStringArray<T, N, sizeof ... (Ox)> qOffsetStringArray(