From a27b50dcaf6231e8dadd6d26d03d204648f398c0 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 3 Jul 2019 15:40:45 +0200 Subject: [PATCH] algorithm.h: Fix compilation with Qt 5.13.1 Fix the version check for the developer branch. Amends c2fd7743e07ce98c5852f1c2998ff63b54cbc596. Change-Id: I552330bcbbd00367d8b7044d3bf5dc6952d1a469 Reviewed-by: hjk --- src/libs/utils/algorithm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/utils/algorithm.h b/src/libs/utils/algorithm.h index dd65678c6cc..237863c573d 100644 --- a/src/libs/utils/algorithm.h +++ b/src/libs/utils/algorithm.h @@ -1249,7 +1249,7 @@ OutputIterator set_union(InputIterator1 first1, template QSet toSet(const QList &list) { -#if (QT_VERSION <= QT_VERSION_CHECK(5, 13, 0)) +#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) return list.toSet(); #else return QSet(list.begin(), list.end()); @@ -1259,7 +1259,7 @@ QSet toSet(const QList &list) template QList toList(const QSet &set) { -#if (QT_VERSION <= QT_VERSION_CHECK(5, 13, 0)) +#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) return set.toList(); #else return QList(set.begin(), set.end());