diff options
| author | hjk <hjk@qt.io> | 2019-06-26 09:21:00 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-07-01 10:05:39 +0000 |
| commit | ddfa9a70ad02bc94d3178912b520b86506f9c08c (patch) | |
| tree | c4be64f00b323f8d5872c02374105734c53f7855 | |
| parent | 2ccf486ae72c862c9a2b38fddff8d1e43a2a7ea6 (diff) | |
Adapt to upstream introduction of std::hash<QString>
Change-Id: If6671dd7c7a68ac3e1728fcb1790e6abf7c0b019
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | src/lib/corelib/tools/qttools.h | 2 |
1 files changed, 2 insertions, 0 deletions
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<QString> { std::size_t operator()(const QString &s) const { return qHash(s); } }; +#endif template<typename T1, typename T2> struct hash<std::pair<T1, T2>> { |