diff options
Diffstat (limited to 'tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp')
| -rw-r--r-- | tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp b/tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp index e2b2373e76..04c9b3f72c 100644 --- a/tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp +++ b/tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -35,6 +35,7 @@ #include <QtGui/QPainter> #include <QtGui/QOpenGLTexture> +#include <QtGui/QOpenGLFunctions> #include <QtGui/QMatrix4x4> #include <QtCore/QCoreApplication> @@ -67,10 +68,11 @@ void QOpenGLTextureBlitWindow::render() m_context->makeCurrent(this); QRect viewport(0,0,dWidth(),dHeight()); - glViewport(0,0,dWidth(), dHeight()); + QOpenGLFunctions *functions = m_context->functions(); + functions->glViewport(0,0,dWidth(), dHeight()); - glClearColor(0.f, .6f, .0f, 0.f); - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + functions->glClearColor(0.f, .6f, .0f, 0.f); + functions->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); QOpenGLTexture texture(m_image); texture.setWrapMode(QOpenGLTexture::ClampToEdge); |