diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-21 19:07:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-21 19:07:53 +0100 |
| commit | 65faf4565595d91996ddec4af25af5e97c7f0317 (patch) | |
| tree | a7415e90db3fa1e46f638e1c31d2f2b9a5d0ec4a /src/corelib/kernel/qmetatype.cpp | |
| parent | a9383ef99a29c333a1edd32695ddc29ea0ba805d (diff) | |
| parent | 26bc4ac5cb56ce8f2d3d10125fa9c6a72140573a (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/plugins/platforms/eglfs/eglfs-plugin.pro
Change-Id: Id76cdbb41b7758572a3b8ea4dcb40d49bac968db
Diffstat (limited to 'src/corelib/kernel/qmetatype.cpp')
| -rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 38e0d6055c..fc8d7dcfea 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -1341,7 +1341,6 @@ bool QMetaType::save(QDataStream &stream, int type, const void *data) case QMetaType::UnknownType: case QMetaType::Void: case QMetaType::VoidStar: - case QMetaType::Nullptr: case QMetaType::QObjectStar: case QMetaType::QModelIndex: case QMetaType::QPersistentModelIndex: @@ -1350,6 +1349,8 @@ bool QMetaType::save(QDataStream &stream, int type, const void *data) case QMetaType::QJsonArray: case QMetaType::QJsonDocument: return false; + case QMetaType::Nullptr: + return true; case QMetaType::Long: stream << qlonglong(*static_cast<const long *>(data)); break; @@ -1563,7 +1564,6 @@ bool QMetaType::load(QDataStream &stream, int type, void *data) case QMetaType::UnknownType: case QMetaType::Void: case QMetaType::VoidStar: - case QMetaType::Nullptr: case QMetaType::QObjectStar: case QMetaType::QModelIndex: case QMetaType::QPersistentModelIndex: @@ -1572,6 +1572,8 @@ bool QMetaType::load(QDataStream &stream, int type, void *data) case QMetaType::QJsonArray: case QMetaType::QJsonDocument: return false; + case QMetaType::Nullptr: + return true; case QMetaType::Long: { qlonglong l; stream >> l; |