diff options
Diffstat (limited to 'src/gui/kernel/qopenglcontext.h')
| -rw-r--r-- | src/gui/kernel/qopenglcontext.h | 55 |
1 files changed, 11 insertions, 44 deletions
diff --git a/src/gui/kernel/qopenglcontext.h b/src/gui/kernel/qopenglcontext.h index a0d8a3edba..ca2d4a8903 100644 --- a/src/gui/kernel/qopenglcontext.h +++ b/src/gui/kernel/qopenglcontext.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 QOPENGLCONTEXT_H #define QOPENGLCONTEXT_H @@ -45,8 +9,10 @@ #ifndef QT_NO_OPENGL #include <QtCore/qnamespace.h> -#include <QtCore/QObject> -#include <QtCore/QScopedPointer> +#include <QtCore/qobject.h> +#include <QtCore/qscopedpointer.h> +#include <QtCore/qset.h> +#include <QtCore/qnativeinterface.h> #include <QtGui/QSurfaceFormat> @@ -88,6 +54,7 @@ private: QOpenGLContextGroup(); friend class QOpenGLContext; + friend class QOpenGLContextPrivate; friend class QOpenGLContextGroupResourceBase; friend class QOpenGLSharedResource; friend class QOpenGLMultiGroupSharedResource; @@ -107,7 +74,6 @@ public: void setFormat(const QSurfaceFormat &format); void setShareContext(QOpenGLContext *shareContext); void setScreen(QScreen *screen); - void setNativeHandle(const QVariant &handle); bool create(); bool isValid() const; @@ -116,7 +82,6 @@ public: QOpenGLContext *shareContext() const; QOpenGLContextGroup *shareGroup() const; QScreen *screen() const; - QVariant nativeHandle() const; GLuint defaultFramebufferObject() const; @@ -141,8 +106,6 @@ public: QSet<QByteArray> extensions() const; bool hasExtension(const QByteArray &extension) const; - static void *openGLModuleHandle(); - enum OpenGLModuleType { LibGL, LibGLES @@ -155,6 +118,8 @@ public: static bool supportsThreadedOpenGL(); static QOpenGLContext *globalShareContext(); + QT_DECLARE_NATIVE_INTERFACE_ACCESSOR(QOpenGLContext) + Q_SIGNALS: void aboutToBeDestroyed(); @@ -188,6 +153,8 @@ Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QOpenGLContextGroup *cg); QT_END_NAMESPACE +#include <QtGui/qopenglcontext_platform.h> + #endif // QT_NO_OPENGL #endif // QOPENGLCONTEXT_H |