feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core: Work around upstream introduction of std::hash<QString>

Browse Source 
Change-Id: I51d7e97011d03b1b1af921e55ccc40a61d8822f7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-06-24 17:23:12 +02:00
parent cf7fa03866
commit 0d7f33aa71
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/jsexpander.cpp
View File

@@ -36,6 +36,7 @@
#include <unordered_map> #include <unordered_map>
#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
namespace std { namespace std {
template<> struct hash<QString> template<> struct hash<QString>
{ {
@@ -47,6 +48,7 @@ template<> struct hash<QString>
} }
}; };
} // namespace std } // namespace std
#endif
using ExtensionMap = std::unordered_map<QString, Core::JsExpander::ObjectFactory>; using ExtensionMap = std::unordered_map<QString, Core::JsExpander::ObjectFactory>;
Q_GLOBAL_STATIC(ExtensionMap, globalJsExtensions); Q_GLOBAL_STATIC(ExtensionMap, globalJsExtensions);