diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-11 01:00:24 +0100 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-03-11 11:27:49 +0100 |
commit | 116d68f105db025f56c1fd5115ff4924bc22d7c2 (patch) | |
tree | ae04596b19c34eccc60ff7477da6a0166c5f82b1 /src/corelib/serialization/qcborvalue_p.h | |
parent | 52de905d0ec6159d3a1e7ad63fed018b5c6973d2 (diff) | |
parent | bd3c82f8db4391fc1d6d3338827356143fd598dd (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/corelib/plugin/qlibrary.cpp
src/corelib/plugin/qlibrary_unix.cpp
src/corelib/plugin/qpluginloader.cpp
Change-Id: I866feaaa2a4936ee5389679724c8471a5b4b583d
Diffstat (limited to 'src/corelib/serialization/qcborvalue_p.h')
-rw-r--r-- | src/corelib/serialization/qcborvalue_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/serialization/qcborvalue_p.h b/src/corelib/serialization/qcborvalue_p.h index 48818e4c63..a74ac2ba10 100644 --- a/src/corelib/serialization/qcborvalue_p.h +++ b/src/corelib/serialization/qcborvalue_p.h @@ -115,7 +115,8 @@ struct ByteData QStringView asStringView() const{ return QStringView(utf16(), len / 2); } QString asQStringRaw() const { return QString::fromRawData(utf16(), len / 2); } }; -Q_STATIC_ASSERT(std::is_pod<ByteData>::value); +Q_STATIC_ASSERT(std::is_trivial<ByteData>::value); +Q_STATIC_ASSERT(std::is_standard_layout<ByteData>::value); } // namespace QtCbor Q_DECLARE_TYPEINFO(QtCbor::Element, Q_PRIMITIVE_TYPE); |