diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-05 01:00:43 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-05 01:00:44 +0100 |
| commit | 2625d2713cfecca209d9a1423e1536825bf3a7cb (patch) | |
| tree | 491e0f269d61b64cc72db8271f02567b9bbd9bcf /src/corelib/kernel/qvariant.cpp | |
| parent | 8652c79df0a47264a2d525424484e15744e2462b (diff) | |
| parent | de6520805abafbc6f898b3fec043e5d85827dfd0 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I9d63a4c4b229a831b5369f6ec74ac97ba6d6556a
Diffstat (limited to 'src/corelib/kernel/qvariant.cpp')
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 1fe6ca7b4e..72f085d14b 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -2583,8 +2583,8 @@ void QVariant::save(QDataStream &s) const #endif // and as a result these types received lower ids too typeId +=1; - } else if (typeId == QMetaType::QPolygonF) { - // This existed in Qt 4 only as a custom type + } else if (typeId == QMetaType::QPolygonF || typeId == QMetaType::QUuid) { + // These existed in Qt 4 only as a custom type typeId = 127; fakeUserType = true; } |