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

Fix compilation with Qt 5.13

Browse Source 
Change-Id: I6e95bf74dc3a123aa635f0a44a2ea357a6dd7da2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
hjk
2019-07-03 15:16:07 +02:00
parent a5bb85c76b
commit c2fd7743e0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1249,20 +1249,20 @@ OutputIterator set_union(InputIterator1 first1,
template <class T> template <class T>
QSet<T> toSet(const QList<T> &list) QSet<T> toSet(const QList<T> &list)
{ {
#if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0)) #if (QT_VERSION <= QT_VERSION_CHECK(5, 13, 0))
return list.toSet(); return list.toSet();
#else #else
return QSet<T>{list.begin(), list.end()}; return QSet<T>(list.begin(), list.end());
#endif #endif
} }
template <class T> template <class T>
QList<T> toList(const QSet<T> &set) QList<T> toList(const QSet<T> &set)
{ {
#if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0)) #if (QT_VERSION <= QT_VERSION_CHECK(5, 13, 0))
return set.toList(); return set.toList();
#else #else
return QList<T>{set.begin(), set.end()}; return QList<T>(set.begin(), set.end());
#endif #endif
} }