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 ff59d31a0f18d4767f5a3fb946b0a3e839777721..e763302ec41acb26548cc4b71be5a41f39c93505 100644 (file)
--- a/pv/data/decode/rowdata.hpp
+++ b/pv/data/decode/rowdata.hpp
@@ -23,6 +23,7 @@
 #include <unordered_map>
 #include <vector>
 
 #include <unordered_map>
 #include <vector>
 

+#include <QtGlobal>

 #include <QHash>
 #include <QString>
 
 #include <QHash>
 #include <QString>
 


@@ -33,6 +34,7 @@
 using std::deque;
 using std::unordered_map;
 
 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 {
 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 {
 
 namespace pv {
 namespace data {