1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove some pre-Qt6 code

Browse Source 
Task-number: QTBUG-85700
Change-Id: Id4856d035b697276f6a7090956359044bac7d817
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
This commit is contained in:
Edward Welbourne 2020-07-21 16:34:40 +02:00
parent 7a15d71def
commit c0e51ee9df
4 changed files with 0 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/corelib/.prev_CMakeLists.txt
View File

@ -32,7 +32,6 @@ qt_add_module(Core
global/qsysinfo.h global/qsysinfo.h
global/qsystemdetection.h global/qsystemdetection.h
global/qtypeinfo.h global/qtypeinfo.h
global/qtypetraits.h
global/qversiontagging.h global/qversiontagging.h
io/qabstractfileengine.cpp io/qabstractfileengine_p.h io/qabstractfileengine.cpp io/qabstractfileengine_p.h
io/qbuffer.cpp io/qbuffer.h io/qbuffer.cpp io/qbuffer.h

1
src/corelib/CMakeLists.txt
View File

@ -54,7 +54,6 @@ qt_add_module(Core
global/qsysinfo.h global/qsysinfo.h
global/qsystemdetection.h global/qsystemdetection.h
global/qtypeinfo.h global/qtypeinfo.h
global/qtypetraits.h
global/qversiontagging.cpp global/qversiontagging.h # special case global/qversiontagging.cpp global/qversiontagging.h # special case
io/qabstractfileengine.cpp io/qabstractfileengine_p.h io/qabstractfileengine.cpp io/qabstractfileengine_p.h
io/qbuffer.cpp io/qbuffer.h io/qbuffer.cpp io/qbuffer.h

1
src/corelib/global/global.pri
View File

@ -23,7 +23,6 @@ HEADERS += \
global/qisenum.h \ global/qisenum.h \
global/qsimd.h \ global/qsimd.h \
global/qsimd_p.h \ global/qsimd_p.h \
global/qtypetraits.h \
global/qflags.h \ global/qflags.h \
global/qrandom.h \ global/qrandom.h \
global/qrandom_p.h \ global/qrandom_p.h \

55
src/corelib/global/qtypetraits.h
View File

@ -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