diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2022-12-19 12:23:17 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2023-02-10 12:37:17 +0100 |
| commit | c889af388062bbee6e52e68a22ac8632fb12ff02 (patch) | |
| tree | 0b4823adb8ca383e0a55fcbeb6e262363c42e0e8 /tests/auto/render/opengl/graphicshelpergl4 | |
| parent | 390f724912eb73461295e68535e053eb27e28af9 (diff) | |
Remove Qt6 QT_VERSION checks from the code base
Those are left overs from the Qt 5.15 to Qt 6 port. Now that both
code based have diverged, there's no much point in keeping those
checks.
Pick-to: 6.5
Change-Id: I4e83876b6b4cb18b181af32e376f4411054a1183
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'tests/auto/render/opengl/graphicshelpergl4')
| -rw-r--r-- | tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp b/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp index cb7bcbaa8..780369f48 100644 --- a/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp +++ b/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp @@ -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(); |