From 4bc9e3b8470ed2026604dc06dc027c80e6f7c445 Mon Sep 17 00:00:00 2001
From: David Faure <david.faure@kdab.com>
Date: Fri, 28 Feb 2020 20:00:24 +0100
Subject: [PATCH] QDataStream: fix compilation with
 QT_DISABLE_DEPRECATED_BEFORE=0x0050F00

Fixes: QTBUG-81023
Change-Id: I0d56785d1fed2c4c8e0e87ccefb0b72b0ed3644a
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
---
 src/corelib/serialization/qdatastream.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

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 <typename T>
+struct MultiContainer { using type = T; };
+template <typename K, typename V>
+struct MultiContainer<QMap<K, V>> { using type = QMultiMap<K, V>; };
+template <typename K, typename V>
+struct MultiContainer<QHash<K, V>> { using type = QMultiHash<K, V>; };
+
 template <typename Container>
 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<typename MultiContainer<Container>::type &>(c).insert(k, t);
     }
 
     return s;