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

[pulseview.git] / pv / data / decode / rowdata.hpp

diff --git a/pv/data/decode/rowdata.hpp b/pv/data/decode/rowdata.hpp
index f01aa3ca81c2f71a24c61dc71f7b1d1ba67f7139..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 <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 {
@@ -66,6 +69,8 @@ public:
        void get_annotation_subset(deque<const pv::data::decode::Annotation*> &dest,
                uint64_t start_sample, uint64_t end_sample) const;
 
+       const deque<Annotation>& annotations() const;
+
        const Annotation* emplace_annotation(srd_proto_data *pdata);
 
 private: