summaryrefslogtreecommitdiffstats
path: root/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2020-04-27 11:56:17 +0100
committerPaul Lemire <paul.lemire@kdab.com>2020-05-06 15:29:54 +0200
commit764924da8ab3255c1b8d1ad5b39f85675f4b855e (patch)
treec7b3e9d94318fd347ef2717feb5b539f5c18ff13 /tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp
parent9838d91e2d433f13c57bdae48e31ba0b909988aa (diff)
Fix build for Qt6
- updated dependencies, excluding qtgamepad for now - fixed issues with Q_PROPERTY not supporting forward declarations - fixed for changes in QtQuick private API - fixed for changes in QtOpenGLVersionFunctions API - fixed for removal of QT_OPENGL_ES* macros - fixed for changes in QtConcurrent API - fixed RHI based build Change-Id: I42ccd2f101b7f0a78e2860c6d551722bf6710a11 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp')
-rw-r--r--tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp b/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp
index 8f86f38ce..92a4a4af0 100644
--- a/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp
+++ b/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp
@@ -36,8 +36,9 @@
#include <QOpenGLShaderProgram>
#include <QOpenGLVertexArrayObject>
#include <QSurfaceFormat>
+#include <QtOpenGL/QOpenGLVersionFunctionsFactory>
-#if !defined(QT_OPENGL_ES_2) && defined(QT_OPENGL_4_3)
+#if !QT_CONFIG(opengles2) && defined(QT_OPENGL_4_3)
#define TEST_SHOULD_BE_PERFORMED 1
@@ -255,7 +256,7 @@ private Q_SLOTS:
return;
}
- if ((m_func = m_glContext.versionFunctions<QOpenGLFunctions_4_3_Core>()) != nullptr) {
+ if ((m_func = QOpenGLVersionFunctionsFactory::get<QOpenGLFunctions_4_3_Core>()) != nullptr) {
m_glHelper.initializeHelper(&m_glContext, m_func);
m_initializationSuccessful = true;
}