From ddfa9a70ad02bc94d3178912b520b86506f9c08c Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 26 Jun 2019 09:21:00 +0200 Subject: Adapt to upstream introduction of std::hash Change-Id: If6671dd7c7a68ac3e1728fcb1790e6abf7c0b019 Reviewed-by: Christian Kandeler --- src/lib/corelib/tools/qttools.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/lib/corelib/tools/qttools.h b/src/lib/corelib/tools/qttools.h index 4cb39527e..b465e3d9e 100644 --- a/src/lib/corelib/tools/qttools.h +++ b/src/lib/corelib/tools/qttools.h @@ -50,9 +50,11 @@ class QProcessEnvironment; QT_END_NAMESPACE namespace std { +#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) template<> struct hash { std::size_t operator()(const QString &s) const { return qHash(s); } }; +#endif template struct hash> { -- cgit v1.2.3