summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-09-03 11:01:39 +0200
committerLars Knoll <lars.knoll@qt.io>2020-09-05 02:12:15 +0200
commit247c10bf4cb427146b87631906391aae442f7c7b (patch)
tree16432aebade98b7490ec439575ca1320ad0bc7bb
parent99e52b368eb03e2c8580bcaedb5b592ad49bb47c (diff)
Get rid of the MSVC specific file
It used to contain the MSVC specific export hack for QVector, but that one is not required in Qt 6 anymore and the file was not doing anything anymore. Change-Id: Ic8b4aa355a8934beb6abcf10235d218344a294cc Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
-rw-r--r--src/corelib/CMakeLists.txt7
-rw-r--r--src/corelib/tools/qvector_msvc.cpp51
-rw-r--r--src/corelib/tools/tools.pri3
3 files changed, 0 insertions, 61 deletions
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index 15f83ee637..fa33bf540a 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -693,13 +693,6 @@ qt_extend_target(Core CONDITION ICC
strict
)
-qt_extend_target(Core CONDITION MSVC
- SOURCES
- tools/qvector_msvc.cpp
- NO_PCH_SOURCES
- "tools/qvector_msvc.cpp"
-)
-
qt_extend_target(Core CONDITION QT_FEATURE_system_zlib
LIBRARIES
ZLIB::ZLIB
diff --git a/src/corelib/tools/qvector_msvc.cpp b/src/corelib/tools/qvector_msvc.cpp
deleted file mode 100644
index e3815852dc..0000000000
--- a/src/corelib/tools/qvector_msvc.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/****************************************************************************
-**
-** 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$
-**
-****************************************************************************/
-
-// ### Qt6: verify if we can remove this, somehow.
-// First, try to see if the extern template from qlist.h is necessary.
-// If it still is, check if removing the copy constructors in qarraydata.h
-// make the calling convention of both sets of begin() and end() functions
-// match, as it does for the IA-64 C++ ABI.
-
-#ifdef QVECTOR_H
-# error "This file must be compiled with no precompiled headers"
-#endif
-
-// the Q_TEMPLATE_EXTERN at the bottom of qlist.h will do the trick
-#include <QtCore/qlist.h>
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index 1668c57e8b..e57fa6e8ed 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -68,9 +68,6 @@ SOURCES += \
tools/qsize.cpp \
tools/qversionnumber.cpp
-msvc: NO_PCH_SOURCES += tools/qvector_msvc.cpp
-false: SOURCES += $$NO_PCH_SOURCES # Hack for QtCreator
-
qtConfig(system-zlib) {
include($$PWD/../../3rdparty/zlib_dependency.pri)
} else {