From: Soeren Apel <redacted>
Date: Tue, 5 May 2020 12:50:29 +0000 (+0200)
Subject: Fix #1542 by providing std::hash<QString> implementation as needed
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=9a5ef9a0d7966bf956f0b32bf3a57029a8d7d45a;p=pulseview.git

Fix #1542 by providing std::hash<QString> implementation as needed
---

diff --git a/pv/data/decode/rowdata.hpp b/pv/data/decode/rowdata.hpp
index ff59d31a..e763302e 100644
--- a/pv/data/decode/rowdata.hpp
+++ b/pv/data/decode/rowdata.hpp
@@ -23,6 +23,7 @@
 #include <unordered_map>
 #include <vector>
 
+#include <QtGlobal>
 #include <QHash>
 #include <QString>
 
@@ -33,6 +34,7 @@
 using std::deque;
 using std::unordered_map;
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
 namespace std {
   template<> struct hash<QString> {
     std::size_t operator()(const QString& s) const noexcept {
@@ -40,6 +42,7 @@ namespace std {
     }
   };
 }
+#endif
 
 namespace pv {
 namespace data {