From cfa3633025e15f1db467520548013095b67c47ca Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 30 Oct 2020 11:04:23 +0100 Subject: [PATCH] Remove Q_IS_ENUM Deprecated since 5.8 already. Change-Id: I01ea32b5f4b922cecb18c5760a1b5fa49c4e54c0 Reviewed-by: Volker Hilsheimer --- src/corelib/CMakeLists.txt | 1 - src/corelib/global/global.pri | 1 - src/corelib/global/qisenum.h | 51 ----------------------------------- 3 files changed, 53 deletions(-) delete mode 100644 src/corelib/global/qisenum.h diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 8a3bc0ab84..2703ec5913 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -40,7 +40,6 @@ qt_internal_add_module(Core global/qglobal.cpp global/qglobal.h global/qglobalstatic.h global/qhooks.cpp global/qhooks_p.h - global/qisenum.h global/qlibraryinfo.cpp global/qlibraryinfo.h global/qlogging.cpp global/qlogging.h global/qmalloc.cpp diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri index a556f91218..4e9a0a0c8b 100644 --- a/src/corelib/global/global.pri +++ b/src/corelib/global/global.pri @@ -20,7 +20,6 @@ HEADERS += \ global/qlogging.h \ global/qtypeinfo.h \ global/qsysinfo.h \ - global/qisenum.h \ global/qsimd.h \ global/qsimd_p.h \ global/qflags.h \ diff --git a/src/corelib/global/qisenum.h b/src/corelib/global/qisenum.h deleted file mode 100644 index 8f784ef6e3..0000000000 --- a/src/corelib/global/qisenum.h +++ /dev/null @@ -1,51 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** 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 - -#ifndef QISENUM_H -#define QISENUM_H - -// Use of Q_IS_ENUM is deprecated since 5.8 -#define Q_IS_ENUM(x) std::is_enum::value - -// shut up syncqt -QT_BEGIN_NAMESPACE -QT_END_NAMESPACE -#endif // QISENUM_H