diff options
| author | hjk <hjk@qt.io> | 2019-06-24 17:23:12 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-07-01 16:05:23 +0000 |
| commit | 0d7f33aa7144708d01e8d4dc29ef3e53514d6be9 (patch) | |
| tree | 36ff3a9a48b55f1f665d8d784928a5d3c8c1418a /src/plugins/coreplugin | |
| parent | cf7fa03866b88e36ace93fabad3428905066ce4c (diff) | |
| download | qt-creator-0d7f33aa7144708d01e8d4dc29ef3e53514d6be9.tar.gz | |
Core: Work around upstream introduction of std::hash<QString>
Change-Id: I51d7e97011d03b1b1af921e55ccc40a61d8822f7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/coreplugin')
| -rw-r--r-- | src/plugins/coreplugin/jsexpander.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/coreplugin/jsexpander.cpp b/src/plugins/coreplugin/jsexpander.cpp index 4ee72752e5..22a4562685 100644 --- a/src/plugins/coreplugin/jsexpander.cpp +++ b/src/plugins/coreplugin/jsexpander.cpp @@ -36,6 +36,7 @@ #include <unordered_map> +#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) namespace std { template<> struct hash<QString> { @@ -47,6 +48,7 @@ template<> struct hash<QString> } }; } // namespace std +#endif using ExtensionMap = std::unordered_map<QString, Core::JsExpander::ObjectFactory>; Q_GLOBAL_STATIC(ExtensionMap, globalJsExtensions); |