summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-05 01:00:43 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-05 01:00:44 +0100
commit2625d2713cfecca209d9a1423e1536825bf3a7cb (patch)
tree491e0f269d61b64cc72db8271f02567b9bbd9bcf /tests/auto/corelib
parent8652c79df0a47264a2d525424484e15744e2462b (diff)
parentde6520805abafbc6f898b3fec043e5d85827dfd0 (diff)
Merge remote-tracking branch 'origin/5.15' into dev
Diffstat (limited to 'tests/auto/corelib')
-rw-r--r--tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp20
1 files changed, 20 insertions, 0 deletions
diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
index 4fbd15f91d..6381030394 100644
--- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
+++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
@@ -273,6 +273,7 @@ private slots:
void accessSequentialContainerKey();
void fromStdVariant();
+ void qt4UuidDataStream();
private:
void dataStream_data(QDataStream::Version version);
@@ -4602,5 +4603,24 @@ void tst_QVariant::fromStdVariant()
#endif
}
+void tst_QVariant::qt4UuidDataStream()
+{
+ qRegisterMetaTypeStreamOperators<QUuid>();
+
+ QByteArray data;
+ QDataStream stream(&data, QIODevice::WriteOnly);
+ stream.setVersion(QDataStream::Qt_4_8);
+ QUuid source(0x12345678,0x1234,0x1234,0x12,0x23,0x34,0x45,0x56,0x67,0x78,0x89);
+ stream << QVariant::fromValue(source);
+ const QByteArray qt4Data = QByteArray::fromHex("0000007f000000000651557569640012345678123412341223344556677889");
+ QCOMPARE(data, qt4Data);
+
+ QDataStream input(&data, QIODevice::ReadOnly);
+ input.setVersion(QDataStream::Qt_4_8);
+ QVariant result;
+ input >> result;
+ QCOMPARE(result.value<QUuid>(), source);
+}
+
QTEST_MAIN(tst_QVariant)
#include "tst_qvariant.moc"