From c3a9c1ecbca15d2cab14e6c43cd683de4ad59b3a Mon Sep 17 00:00:00 2001
From: Sona Kurazyan <sona.kurazyan@qt.io>
Date: Thu, 22 Jul 2021 15:13:28 +0200
Subject: QtConcurrent: Remove the redundant code for QStringList
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

QStringList is a typedef for QList<QString>, so it doesn't need special
handling.

Change-Id: Ib371f9fa49d9d45da7956287dd0f5b6c0224f439
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 src/concurrent/qtconcurrentfunctionwrappers.h | 7 -------
 src/concurrent/qtconcurrentmap.h              | 1 -
 2 files changed, 8 deletions(-)

diff --git a/src/concurrent/qtconcurrentfunctionwrappers.h b/src/concurrent/qtconcurrentfunctionwrappers.h
index 59d2d61af68..be4a09f107d 100644
--- a/src/concurrent/qtconcurrentfunctionwrappers.h
+++ b/src/concurrent/qtconcurrentfunctionwrappers.h
@@ -42,7 +42,6 @@
 
 #include <QtConcurrent/qtconcurrentcompilertest.h>
 #include <QtCore/qfuture.h>
-#include <QtCore/QStringList>
 
 #include <tuple>
 
@@ -193,12 +192,6 @@ struct ReduceResultTypeHelper<Callable,
 template <class InputSequence, class MapFunctor>
 struct MapSequenceResultType;
 
-template <class MapFunctor>
-struct MapSequenceResultType<QStringList, MapFunctor>
-{
-    typedef QList<QtPrivate::MapResultType<QStringList, MapFunctor>> ResultType;
-};
-
 #ifndef QT_NO_TEMPLATE_TEMPLATE_PARAMETERS
 
 template <template <typename...> class InputSequence, typename MapFunctor, typename ...T>
diff --git a/src/concurrent/qtconcurrentmap.h b/src/concurrent/qtconcurrentmap.h
index 44a6caea4c3..3e20f8b4dce 100644
--- a/src/concurrent/qtconcurrentmap.h
+++ b/src/concurrent/qtconcurrentmap.h
@@ -47,7 +47,6 @@
 #include <QtConcurrent/qtconcurrentmapkernel.h>
 #include <QtConcurrent/qtconcurrentreducekernel.h>
 #include <QtConcurrent/qtconcurrentfunctionwrappers.h>
-#include <QtCore/qstringlist.h>
 
 QT_BEGIN_NAMESPACE
 
-- 
cgit v1.2.3