Merge remote-tracking branch 'origin/Applications/19.08'

7 years ago · e27e9428c5
parent 9c2149646a 671da7dec6
commit e27e9428c5
1 changed files with 2 additions and 0 deletions
--- a/agents/unifiedmailboxagent/utils.h
+++ b/agents/unifiedmailboxagent/utils.h
@ -53,6 +53,7 @@ inline QSet<T> listToSet(QList<T> &&list)
    return rv;
 }

+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
 namespace std {
 template<>
 struct hash<QString> {
@ -62,5 +63,6 @@ struct hash<QString> {
    }
 };
 }
+#endif

 #endif