From 764924da8ab3255c1b8d1ad5b39f85675f4b855e Mon Sep 17 00:00:00 2001
From: Mike Krus <mike.krus@kdab.com>
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 <paul.lemire@kdab.com>
---
 tests/manual/boundingvolumes/main.cpp                     | 2 +-
 tests/manual/manual-renderloop/main.cpp                   | 2 +-
 tests/manual/qtbug-76766/main.cpp                         | 2 +-
 tests/manual/rendercapture-cpp/orbittransformcontroller.h | 5 +----
 4 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'tests/manual')

diff --git a/tests/manual/boundingvolumes/main.cpp b/tests/manual/boundingvolumes/main.cpp
index 2a988a271..4d22a5b68 100644
--- a/tests/manual/boundingvolumes/main.cpp
+++ b/tests/manual/boundingvolumes/main.cpp
@@ -56,7 +56,7 @@ int main(int argc, char **argv)
     {
         // Set OpenGL requirements
         QSurfaceFormat format = QSurfaceFormat::defaultFormat();
-#ifndef QT_OPENGL_ES_2
+#if !QT_CONFIG(opengles2)
         format.setVersion(4, 1);
         format.setProfile(QSurfaceFormat::CoreProfile);
         format.setSamples(4);
diff --git a/tests/manual/manual-renderloop/main.cpp b/tests/manual/manual-renderloop/main.cpp
index 44d661136..a3f108e50 100644
--- a/tests/manual/manual-renderloop/main.cpp
+++ b/tests/manual/manual-renderloop/main.cpp
@@ -172,7 +172,7 @@ private:
 int main(int ac, char **av)
 {
     QSurfaceFormat format = QSurfaceFormat::defaultFormat();
-#ifdef QT_OPENGL_ES_2
+#if QT_CONFIG(opengles2)
     format.setRenderableType(QSurfaceFormat::OpenGLES);
 #else
     if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGL) {
diff --git a/tests/manual/qtbug-76766/main.cpp b/tests/manual/qtbug-76766/main.cpp
index f9d49846a..d6cfabd89 100644
--- a/tests/manual/qtbug-76766/main.cpp
+++ b/tests/manual/qtbug-76766/main.cpp
@@ -44,7 +44,7 @@
 void setSurfaceFormat()
 {
     QSurfaceFormat format;
-#ifdef QT_OPENGL_ES_2
+#if QT_CONFIG(opengles2)
     format.setRenderableType(QSurfaceFormat::OpenGLES);
 #else
     if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGL) {
diff --git a/tests/manual/rendercapture-cpp/orbittransformcontroller.h b/tests/manual/rendercapture-cpp/orbittransformcontroller.h
index 5f41722b6..98143388c 100644
--- a/tests/manual/rendercapture-cpp/orbittransformcontroller.h
+++ b/tests/manual/rendercapture-cpp/orbittransformcontroller.h
@@ -54,13 +54,10 @@
 
 #include <QObject>
 #include <QMatrix4x4>
+#include <Qt3DCore/QTransform>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3DCore {
-class QTransform;
-}
-
 class OrbitTransformController : public QObject
 {
     Q_OBJECT
-- 
cgit v1.2.3