Mercurial > ldforge2 / file diff

--- a/src/functional.h	Wed Jun 22 23:51:06 2022 +0300
+++ b/src/functional.h	Sun Jun 26 19:44:45 2022 +0300
@@ -76,14 +76,16 @@
 		return std::back_inserter(vec);
 	}
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+	// In Qt6 QVector is now a QList instead, so we need to disable this
 	// Constructs a back_inserter for QVector
 	template<typename T>
 	auto makeDefaultInserter(QVector<T>& vec)
 	{
 		return std::back_inserter(vec);
 	}
+#endif
 
-	// Constructs a back_inserter for QList
 	template<typename T>
 	auto makeDefaultInserter(QList<T>& vec)
 	{
@@ -110,12 +112,14 @@
 		using type = std::vector<TT>;
 	};
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 	// Changes the value type of QVector
 	template<typename T, typename TT>
 	struct ChangeContainerValueType<QVector<T>, TT>
 	{
 		using type = QVector<TT>;
 	};
+#endif
 
 	// Changes the value type of QSet
 	template<typename T, typename TT>