diff options
Diffstat (limited to 'tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp')
| -rw-r--r-- | tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp b/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp index cb7bcbaa8..d706f7e8a 100644 --- a/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp +++ b/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QTest> #include <Qt3DRender/qrendertargetoutput.h> @@ -11,10 +11,7 @@ #include <QOpenGLShaderProgram> #include <QOpenGLVertexArrayObject> #include <QSurfaceFormat> - -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #include <QtOpenGL/QOpenGLVersionFunctionsFactory> -#endif #if !QT_CONFIG(opengles2) && defined(QT_OPENGL_4_3) @@ -234,11 +231,7 @@ private Q_SLOTS: return; } -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) if ((m_func = QOpenGLVersionFunctionsFactory::get<QOpenGLFunctions_4_3_Core>()) != nullptr) { -#else - if ((m_func = m_glContext.versionFunctions<QOpenGLFunctions_4_3_Core>()) != nullptr) { -#endif m_glHelper.initializeHelper(&m_glContext, m_func); m_initializationSuccessful = true; } @@ -906,11 +899,7 @@ private Q_SLOTS: QVERIFY(error == 0); // THEN -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) QList<QVector4D> colors(512 * 512); -#else - QVector<QVector4D> colors(512 * 512); -#endif textures[3]->bind(); m_func->glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_FLOAT, colors.data()); textures[3]->release(); |