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

Utils: Disable the QVector overloads in algorithm in Qt 6

Browse Source 
Not the QList one.

Change-Id: I05ad3401b8d3abf3ee413ed518574b4362502996
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-06-18 15:03:59 +02:00
parent dd9519b1c4
commit faf9c883f2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1263,7 +1263,6 @@ OutputIterator set_union(InputIterator1 first1,
// Replacement for deprecated Qt functionality
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
template <class T>
QSet<T> toSet(const QList<T> &list)
{
@@ -1273,8 +1272,8 @@ QSet<T> toSet(const QList<T> &list)
return QSet<T>(list.begin(), list.end());
#endif
}
#endif
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
template<class T>
QSet<T> toSet(const QVector<T> &vec)
{
@@ -1288,6 +1287,7 @@ QSet<T> toSet(const QVector<T> &vec)
return QSet<T>(vec.begin(), vec.end());
#endif
}
#endif
template<class T>
QList<T> toList(const QSet<T> &set)