diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:05:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 14:02:43 +0200 |
| commit | 7cbee5629604aa49c618829c8e3e55fc64e94df7 (patch) | |
| tree | d12041105160c1cb21226b365edb9653d87b5853 /src/corelib/tools/qarraydataops.h | |
| parent | e400b7e326c554ccd819448866265953d2a0f24d (diff) | |
| parent | 5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qmenu.cpp
Change-Id: I6d3baf56eb24501cddb129a3cb6b958ccc25a308
Diffstat (limited to 'src/corelib/tools/qarraydataops.h')
| -rw-r--r-- | src/corelib/tools/qarraydataops.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/tools/qarraydataops.h b/src/corelib/tools/qarraydataops.h index ae83e6986e7..b7c3bc1287c 100644 --- a/src/corelib/tools/qarraydataops.h +++ b/src/corelib/tools/qarraydataops.h @@ -49,6 +49,11 @@ QT_BEGIN_NAMESPACE namespace QtPrivate { +QT_WARNING_PUSH +#if defined(Q_CC_GNU) && Q_CC_GNU >= 700 +QT_WARNING_DISABLE_GCC("-Wstringop-overflow") +#endif + template <class T> struct QPodArrayOps : QTypedArrayData<T> @@ -131,6 +136,7 @@ struct QPodArrayOps this->size -= (e - b); } }; +QT_WARNING_POP template <class T> struct QGenericArrayOps |