diff options
Diffstat (limited to 'src/gui/kernel/qplatformscreen_p.h')
-rw-r--r-- | src/gui/kernel/qplatformscreen_p.h | 47 |
1 files changed, 5 insertions, 42 deletions
diff --git a/src/gui/kernel/qplatformscreen_p.h b/src/gui/kernel/qplatformscreen_p.h index 35097b5d23..345a90845c 100644 --- a/src/gui/kernel/qplatformscreen_p.h +++ b/src/gui/kernel/qplatformscreen_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui 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$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QPLATFORMSCREEN_P_H #define QPLATFORMSCREEN_P_H @@ -70,7 +34,7 @@ public: namespace QNativeInterface::Private { -#if QT_CONFIG(xcb) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(xcb) || defined(Q_QDOC) struct Q_GUI_EXPORT QXcbScreen { QT_DECLARE_NATIVE_INTERFACE(QXcbScreen, 1, QScreen) @@ -78,7 +42,7 @@ struct Q_GUI_EXPORT QXcbScreen }; #endif -#if QT_CONFIG(vsp2) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(vsp2) || defined(Q_QDOC) struct Q_GUI_EXPORT QVsp2Screen { QT_DECLARE_NATIVE_INTERFACE(QVsp2Screen, 1, QScreen) @@ -91,7 +55,7 @@ struct Q_GUI_EXPORT QVsp2Screen }; #endif -#if defined(Q_OS_WEBOS) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WEBOS) || defined(Q_QDOC) struct Q_GUI_EXPORT QWebOSScreen { QT_DECLARE_NATIVE_INTERFACE(QWebOSScreen, 1, QScreen) @@ -103,7 +67,6 @@ struct Q_GUI_EXPORT QWebOSScreen virtual void addFlipListener(void (*callback)()) = 0; }; #endif - } // QNativeInterface::Private QT_END_NAMESPACE |