diff options
Diffstat (limited to 'src/gui/kernel/qsurfaceformat.h')
| -rw-r--r-- | src/gui/kernel/qsurfaceformat.h | 70 |
1 files changed, 18 insertions, 52 deletions
diff --git a/src/gui/kernel/qsurfaceformat.h b/src/gui/kernel/qsurfaceformat.h index ed63eb8bbf..07ee1cc07d 100644 --- a/src/gui/kernel/qsurfaceformat.h +++ b/src/gui/kernel/qsurfaceformat.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 QSURFACEFORMAT_H #define QSURFACEFORMAT_H @@ -45,7 +9,7 @@ QT_BEGIN_NAMESPACE - +class QColorSpace; class QOpenGLContext; class QSurfaceFormatPrivate; @@ -57,7 +21,8 @@ public: StereoBuffers = 0x0001, DebugContext = 0x0002, DeprecatedFunctions = 0x0004, - ResetNotification = 0x0008 + ResetNotification = 0x0008, + ProtectedContent = 0x0010 }; Q_ENUM(FormatOption) Q_DECLARE_FLAGS(FormatOptions, FormatOption) @@ -85,14 +50,16 @@ public: }; Q_ENUM(OpenGLContextProfile) +#if QT_DEPRECATED_SINCE(6,0) enum ColorSpace { DefaultColorSpace, sRGBColorSpace }; Q_ENUM(ColorSpace) +#endif QSurfaceFormat(); - /*implicit*/ QSurfaceFormat(FormatOptions options); + Q_IMPLICIT QSurfaceFormat(FormatOptions options); QSurfaceFormat(const QSurfaceFormat &other); QSurfaceFormat &operator=(const QSurfaceFormat &other); ~QSurfaceFormat(); @@ -138,11 +105,6 @@ public: bool stereo() const; void setStereo(bool enable); -#if QT_DEPRECATED_SINCE(5, 2) - QT_DEPRECATED void setOption(QSurfaceFormat::FormatOptions opt); - QT_DEPRECATED bool testOption(QSurfaceFormat::FormatOptions opt) const; -#endif - void setOptions(QSurfaceFormat::FormatOptions options); void setOption(FormatOption option, bool on = true); bool testOption(FormatOption option) const; @@ -151,8 +113,12 @@ public: int swapInterval() const; void setSwapInterval(int interval); - ColorSpace colorSpace() const; + const QColorSpace &colorSpace() const; + void setColorSpace(const QColorSpace &colorSpace); +#if QT_DEPRECATED_SINCE(6,0) + Q_DECL_DEPRECATED_X("Use setColorSpace(QColorSpace) instead.") void setColorSpace(ColorSpace colorSpace); +#endif static void setDefaultFormat(const QSurfaceFormat &format); static QSurfaceFormat defaultFormat(); @@ -161,17 +127,17 @@ private: QSurfaceFormatPrivate *d; void detach(); + bool equals(const QSurfaceFormat &other) const noexcept; - friend Q_GUI_EXPORT bool operator==(const QSurfaceFormat&, const QSurfaceFormat&); - friend Q_GUI_EXPORT bool operator!=(const QSurfaceFormat&, const QSurfaceFormat&); + friend inline bool operator==(const QSurfaceFormat &lhs, const QSurfaceFormat &rhs) noexcept + { return lhs.equals(rhs); } + friend inline bool operator!=(const QSurfaceFormat &lhs, const QSurfaceFormat &rhs) noexcept + { return !lhs.equals(rhs); } #ifndef QT_NO_DEBUG_STREAM friend Q_GUI_EXPORT QDebug operator<<(QDebug, const QSurfaceFormat &); #endif }; -Q_GUI_EXPORT bool operator==(const QSurfaceFormat&, const QSurfaceFormat&); -Q_GUI_EXPORT bool operator!=(const QSurfaceFormat&, const QSurfaceFormat&); - #ifndef QT_NO_DEBUG_STREAM Q_GUI_EXPORT QDebug operator<<(QDebug, const QSurfaceFormat &); #endif |