From faf9c883f2f5772f074e3c13ebbde3057e4dfddf Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 18 Jun 2020 15:03:59 +0200
Subject: Utils: Disable the QVector overloads in algorithm in Qt 6

Not the QList one.

Change-Id: I05ad3401b8d3abf3ee413ed518574b4362502996
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/libs/utils/algorithm.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/libs/utils/algorithm.h')

diff --git a/src/libs/utils/algorithm.h b/src/libs/utils/algorithm.h
index 75937b65aa..212840eeab 100644
--- a/src/libs/utils/algorithm.h
+++ b/src/libs/utils/algorithm.h
@@ -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)
-- 
cgit v1.2.1