From 2a7871cd9bc67a0bf311766a1edee2ff7a8e5355 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sat, 2 Nov 2019 16:20:57 +0900
Subject: Compatibility with Qt 5.14

---
 lib/converters.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'lib/converters.h')

diff --git a/lib/converters.h b/lib/converters.h
index 157bff27..075af7ef 100644
--- a/lib/converters.h
+++ b/lib/converters.h
@@ -30,6 +30,7 @@
 
 #include <vector>
 
+#if QT_VERSION < QT_VERSION_CHECK(5,14,0)
 // Enable std::unordered_map<QString, T>
 // REMOVEME in favor of UnorderedMap, once we regenerate API files
 namespace std {
@@ -37,15 +38,12 @@ template <>
 struct hash<QString> {
     size_t operator()(const QString& s) const Q_DECL_NOEXCEPT
     {
-        return qHash(s
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-                     ,
-                     uint(qGlobalQHashSeed())
-#endif
+        return qHash(s, uint(qGlobalQHashSeed())
         );
     }
 };
 } // namespace std
+#endif
 
 class QVariant;
 
-- 
cgit v1.2.3