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 --- tests/auto/extras/qtext2dentity/tst_qtext2dentity.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/auto/extras/qtext2dentity/tst_qtext2dentity.cpp') diff --git a/tests/auto/extras/qtext2dentity/tst_qtext2dentity.cpp b/tests/auto/extras/qtext2dentity/tst_qtext2dentity.cpp index 6fcc2e637..e2917789e 100644 --- a/tests/auto/extras/qtext2dentity/tst_qtext2dentity.cpp +++ b/tests/auto/extras/qtext2dentity/tst_qtext2dentity.cpp @@ -77,7 +77,7 @@ private slots: void tst_qtext2dentity::checkChangeArbiter() { -#if !defined(QT_OPENGL_ES_2_ANGLE) +#if !QT_CONFIG(angle) // GIVEN Qt3DExtras::Quick::Qt3DQuickWindow view; view.setSource(QUrl("qrc:/qtext2dentity.qml")); -- cgit v1.2.3