Remove MSVC workaround for QPolygon

Change-Id: I62f7c6da7629dcdfda653a136d3bcd483359c86c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

5 files changed, 2 insertions, 70 deletions

diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt
index 2201baa06f..15c85b3400 100644
--- a/qmake/CMakeLists.txt
+++ b/qmake/CMakeLists.txt
@@ -111,7 +111,7 @@ qt_add_tool(${target_name}
         ../src/corelib/time/qromancalendar.cpp ../src/corelib/time/qromancalendar_p.h # special case
         ../src/corelib/time/qdatetime.cpp ../src/corelib/time/qdatetime.h ../src/corelib/time/qdatetime_p.h # special case
         ../src/corelib/tools/qhash.cpp ../src/corelib/tools/qhash.h
-        ../src/corelib/tools/qlist.cpp ../src/corelib/tools/qlist.h
+        ../src/corelib/tools/qlist.h
         ../src/corelib/text/qlocale.cpp ../src/corelib/text/qlocale.h
         ../src/corelib/text/qlocale_tools.cpp ../src/corelib/text/qlocale_tools_p.h
         ../src/corelib/tools/qmap.h
diff --git a/qmake/qmake.pro b/qmake/qmake.pro
index 2cfa7c81a8..4ba7a41fad 100644
--- a/qmake/qmake.pro
+++ b/qmake/qmake.pro
@@ -144,7 +144,6 @@ SOURCES += \
     qjsonparser.cpp \
     qjsonvalue.cpp \
     qlibraryinfo.cpp \
-    qlist.cpp \
     qlocale.cpp \
     qlocale_tools.cpp \
     qlogging.cpp \
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index 3411f4f8f6..9b1272beb6 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -208,7 +208,7 @@ qt_add_module(Core
         tools/qhashfunctions.h
         tools/qiterator.h
         tools/qline.cpp tools/qline.h
-        tools/qlist.cpp tools/qlist.h
+        tools/qlist.h
         tools/qmakearray_p.h
         tools/qmap.h
         tools/qmargins.cpp tools/qmargins.h
diff --git a/src/corelib/tools/qlist.cpp b/src/corelib/tools/qlist.cpp
deleted file mode 100644
index cdcfc30f28..0000000000
--- a/src/corelib/tools/qlist.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Copyright (C) 2016 Intel Corporation.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <new>
-#include "qlist.h"
-#include "qtools_p.h"
-
-#include <string.h>
-#include <stdlib.h>
-
-QT_BEGIN_NAMESPACE
-
-/*
-   ### Qt 5:
-   ### This needs to be removed for next releases of Qt. It is a workaround for vc++ because
-   ### Qt exports QPolygon and QPolygonF that inherit QList<QPoint> and
-   ### QList<QPointF> respectively.
-*/
-
-#if defined(Q_CC_MSVC) && defined(QT_BUILD_CORE_LIB)
-QT_BEGIN_INCLUDE_NAMESPACE
-#include <QtCore/qpoint.h>
-QT_END_INCLUDE_NAMESPACE
-
-template class Q_CORE_EXPORT QList<QPointF>;
-template class Q_CORE_EXPORT QList<QPoint>;
-#endif
-
-QT_END_NAMESPACE
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index 9380b8bd5a..1668c57e8b 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -56,7 +56,6 @@ SOURCES += \
         tools/qfreelist.cpp \
         tools/qhash.cpp \
         tools/qline.cpp \
-        tools/qlist.cpp \
         tools/qpoint.cpp \
         tools/qmargins.cpp \
         tools/qmessageauthenticationcode.cpp \