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 12:27:40 +0100 |
| commit | 12f903b1551c0277e41913989f20e8728c018df6 (patch) | |
| tree | 24451cee1af60255cec0fc3f1bf40de20f999482 /src/corelib/kernel | |
| parent | ee259ff60b6af94d9480ab6c3e3ffbbf7728e4a4 (diff) | |
| parent | 116d68f105db025f56c1fd5115ff4924bc22d7c2 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 99452eb606..21254108e3 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -615,7 +615,8 @@ QMetaTypeComparatorRegistry; typedef QMetaTypeFunctionRegistry<QtPrivate::AbstractDebugStreamFunction,int> QMetaTypeDebugStreamRegistry; -Q_STATIC_ASSERT(std::is_pod<QMetaTypeInterface>::value); +Q_STATIC_ASSERT(std::is_trivial<QMetaTypeInterface>::value); +Q_STATIC_ASSERT(std::is_standard_layout<QMetaTypeInterface>::value); Q_DECLARE_TYPEINFO(QCustomTypeInfo, Q_MOVABLE_TYPE); Q_GLOBAL_STATIC(QVector<QCustomTypeInfo>, customTypes) |