From 0d7f33aa7144708d01e8d4dc29ef3e53514d6be9 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 24 Jun 2019 17:23:12 +0200
Subject: [PATCH] Core: Work around upstream introduction of std::hash<QString>

Change-Id: I51d7e97011d03b1b1af921e55ccc40a61d8822f7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/coreplugin/jsexpander.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/plugins/coreplugin/jsexpander.cpp b/src/plugins/coreplugin/jsexpander.cpp
index 4ee72752e59..22a45626851 100644
--- a/src/plugins/coreplugin/jsexpander.cpp
+++ b/src/plugins/coreplugin/jsexpander.cpp
@@ -36,6 +36,7 @@
 
 #include <unordered_map>
 
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
 namespace std {
 template<> struct hash<QString>
 {
@@ -47,6 +48,7 @@ template<> struct hash<QString>
     }
 };
 } // namespace std
+#endif
 
 using ExtensionMap = std::unordered_map<QString, Core::JsExpander::ObjectFactory>;
 Q_GLOBAL_STATIC(ExtensionMap, globalJsExtensions);