diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-21 16:34:40 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-09-10 14:21:48 +0200 |
| commit | c0e51ee9dfd1f7a8482f9fafdcf72b66f4881ef5 (patch) | |
| tree | a3d7d0559fcea073855b508c0e2915a3c7145a2b /src/corelib/global | |
| parent | 7a15d71def74cd2cb774534df04df7f9bbdd6d1f (diff) | |
Remove some pre-Qt6 code
Task-number: QTBUG-85700
Change-Id: Id4856d035b697276f6a7090956359044bac7d817
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/global.pri | 1 | ||||
| -rw-r--r-- | src/corelib/global/qtypetraits.h | 55 |
2 files changed, 0 insertions, 56 deletions
diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri index e799e13e4c..a556f91218 100644 --- a/src/corelib/global/global.pri +++ b/src/corelib/global/global.pri @@ -23,7 +23,6 @@ HEADERS += \ global/qisenum.h \ global/qsimd.h \ global/qsimd_p.h \ - global/qtypetraits.h \ global/qflags.h \ global/qrandom.h \ global/qrandom_p.h \ diff --git a/src/corelib/global/qtypetraits.h b/src/corelib/global/qtypetraits.h deleted file mode 100644 index 35e407e2de..0000000000 --- a/src/corelib/global/qtypetraits.h +++ /dev/null @@ -1,55 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Marc Mutz <marc.mutz@kdab.com> -** 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$ -** -****************************************************************************/ - -// ### Qt 6: remove this header -// -// This header is deliberately empty. Although it did not contain any public API, -// it was accidentally made public in Qt 5. So: do not remove it for the moment -// being, to prevent #include breaks in downstreams. - -#include "QtCore/qglobal.h" - -#ifndef QTYPETRAITS_H -#define QTYPETRAITS_H - -QT_BEGIN_NAMESPACE - -QT_END_NAMESPACE - -#endif // QTYPETRAITS_H |