summaryrefslogtreecommitdiffstats
path: root/src/corelib/serialization/qdatastream.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2018-11-26 10:37:10 +0100
committerMÃ¥rten Nordheim <marten.nordheim@qt.io>2019-12-12 15:25:26 +0100
commit9c124b1b0a3730978699b8a6420308b5e5ab4e4e (patch)
treeb465457763fb5fe30d5a32867034eae79667bb89 /src/corelib/serialization/qdatastream.h
parentc7e35ffe69a73bb144618714313673f0d0c28394 (diff)
Qt 6: Deprecate QHash::insertMulti
[ChangeLog][QtCore][QHash] insertMulti(), unite() and values(const Key &key) are now deprecated. Please use QMultiHash instead. Change-Id: Ic14907fd5fd38d585708e2dcf2c0200d221ebb25 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/corelib/serialization/qdatastream.h')
-rw-r--r--src/corelib/serialization/qdatastream.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h
index d9d4a4fcd3..4d827772c8 100644
--- a/src/corelib/serialization/qdatastream.h
+++ b/src/corelib/serialization/qdatastream.h
@@ -301,7 +301,10 @@ QDataStream &readAssociativeContainer(QDataStream &s, Container &c)
c.clear();
break;
}
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
c.insertMulti(k, t);
+QT_WARNING_POP
}
return s;