diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h index 4d827772c8..6f6593f9bf 100644 --- a/src/corelib/serialization/qdatastream.h +++ b/src/corelib/serialization/qdatastream.h @@ -285,6 +285,13 @@ QDataStream &readListBasedContainer(QDataStream &s, Container &c) return s; } +template +struct MultiContainer { using type = T; }; +template +struct MultiContainer> { using type = QMultiMap; }; +template +struct MultiContainer> { using type = QMultiHash; }; + template QDataStream &readAssociativeContainer(QDataStream &s, Container &c) { @@ -301,10 +308,7 @@ QDataStream &readAssociativeContainer(QDataStream &s, Container &c) c.clear(); break; } -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - c.insertMulti(k, t); -QT_WARNING_POP + static_cast::type &>(c).insert(k, t); } return s;