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

algorithm.h: Fix compilation with Qt 5.13.1

Browse Source 
Fix the version check for the developer branch.

Amends c2fd7743e0.

Change-Id: I552330bcbbd00367d8b7044d3bf5dc6952d1a469
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Friedemann Kleint
2019-07-03 15:40:45 +02:00
parent c2fd7743e0
commit a27b50dcaf
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

@@ -1249,7 +1249,7 @@ 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, 14, 0))
return list.toSet(); return list.toSet();
#else #else
return QSet<T>(list.begin(), list.end()); return QSet<T>(list.begin(), list.end());
@@ -1259,7 +1259,7 @@ QSet<T> toSet(const QList<T> &list)
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, 14, 0))
return set.toList(); return set.toList();
#else #else
return QList<T>(set.begin(), set.end()); return QList<T>(set.begin(), set.end());