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

Work around QHash::unite deprecation

Browse Source 
Change-Id: Ibf199b5e3f2ca99b7e0cafe20893a509d9eab906
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-02-19 10:13:33 +01:00
parent aeef7137a2
commit e5d1e9d274
6 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libs/utils/algorithm.h
View File

@@ -38,6 +38,7 @@
#include <unordered_map>
#include <unordered_set>
#include <QHash>
#include <QObject>
#include <QSet>
#include <QStringList>
@@ -1298,4 +1299,14 @@ QList<T> toList(const QSet<T> &set)
#endif
}
template <class Key, class T>
void addToHash(QHash<Key, T> *result, const QHash<Key, T> &additionalContents)
{
#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
result->unite(additionalContents);
#else
result->insert(additionalContents);
#endif
}
} // namespace Utils