diff options
Diffstat (limited to 'src/opengl/qgl_qpa.cpp')
| -rw-r--r-- | src/opengl/qgl_qpa.cpp | 43 |
1 files changed, 26 insertions, 17 deletions
diff --git a/src/opengl/qgl_qpa.cpp b/src/opengl/qgl_qpa.cpp index 9c3d4246ae..57c87d1238 100644 --- a/src/opengl/qgl_qpa.cpp +++ b/src/opengl/qgl_qpa.cpp @@ -7,29 +7,29 @@ ** This file is part of the QtOpenGL module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -54,6 +54,9 @@ QT_BEGIN_NAMESPACE +/*! + Returns an OpenGL format for the window format specified by \a format. +*/ QGLFormat QGLFormat::fromWindowFormat(const QWindowFormat &format) { QGLFormat retFormat; @@ -80,6 +83,9 @@ QGLFormat QGLFormat::fromWindowFormat(const QWindowFormat &format) return retFormat; } +/*! + Returns a window format for the OpenGL format specified by \a format. +*/ QWindowFormat QGLFormat::toWindowFormat(const QGLFormat &format) { QWindowFormat retFormat; @@ -366,6 +372,9 @@ QGLContext::QGLContext(QWindowContext *windowContext) d->setupSharing(); } +/*! + Returns a OpenGL context for the window context specified by \a windowContext +*/ QGLContext *QGLContext::fromWindowContext(QWindowContext *windowContext) { if (!windowContext) |