diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-10 21:10:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-10 22:35:04 +0100 |
| commit | 364b161122b567e3a6f7343d438fb540b9fb7e5c (patch) | |
| tree | 3d49953be9a58295a8c956cf5fdb00f581020605 /src/corelib/io/qdatastream.h | |
| parent | e58401a75b29beb38d37a40072106d5ef7cb0336 (diff) | |
| parent | 8a410f60ae39b06555d807581caf7cb8bfab4fac (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qmainwindowlayout_p.h
Change-Id: Id406a67606b885052ed405b0fbc8eea7d9d03224
Diffstat (limited to 'src/corelib/io/qdatastream.h')
| -rw-r--r-- | src/corelib/io/qdatastream.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h index 31507fdf73..993a20fcd3 100644 --- a/src/corelib/io/qdatastream.h +++ b/src/corelib/io/qdatastream.h @@ -360,6 +360,14 @@ inline QDataStream &QDataStream::operator<<(quint32 i) inline QDataStream &QDataStream::operator<<(quint64 i) { return *this << qint64(i); } +template <typename Enum> +inline QDataStream &operator<<(QDataStream &s, QFlags<Enum> e) +{ return s << e.i; } + +template <typename Enum> +inline QDataStream &operator>>(QDataStream &s, QFlags<Enum> &e) +{ return s >> e.i; } + template <typename T> inline QDataStream &operator>>(QDataStream &s, QList<T> &l) { |