From 764924da8ab3255c1b8d1ad5b39f85675f4b855e Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Mon, 27 Apr 2020 11:56:17 +0100 Subject: 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 --- .../filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp') diff --git a/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp b/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp index e5c34f804..7d897a358 100644 --- a/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp +++ b/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp @@ -179,7 +179,7 @@ private Q_SLOTS: void initTestCase() { QSurfaceFormat format; -#ifdef QT_OPENGL_ES_2 +#if QT_CONFIG(opengles2) format.setRenderableType(QSurfaceFormat::OpenGLES); #else if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGL) { -- cgit v1.2.3