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>

5 files changed, 6 insertions, 10 deletions

diff --git a/src/animation/frontend/qabstractclipanimator.h b/src/animation/frontend/qabstractclipanimator.h
index 687589b5e..bbdc1c145 100644
--- a/src/animation/frontend/qabstractclipanimator.h
+++ b/src/animation/frontend/qabstractclipanimator.h
@@ -41,6 +41,8 @@
 #define QT3DANIMATION_QABSTRACTCLIPANIMATOR_H
 
 #include <Qt3DAnimation/qt3danimation_global.h>
+#include <Qt3DAnimation/qchannelmapper.h>
+#include <Qt3DAnimation/qclock.h>
 #include <Qt3DCore/qcomponent.h>
 
 QT_BEGIN_NAMESPACE
@@ -48,8 +50,6 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DAnimation {
 
 class QAnimationClip;
-class QChannelMapper;
-class QClock;
 class QAbstractClipAnimatorPrivate;
 
 class Q_3DANIMATIONSHARED_EXPORT QAbstractClipAnimator : public Qt3DCore::QComponent
diff --git a/src/animation/frontend/qabstractclipblendnode.h b/src/animation/frontend/qabstractclipblendnode.h
index 3bc6d37d0..12630fbf0 100644
--- a/src/animation/frontend/qabstractclipblendnode.h
+++ b/src/animation/frontend/qabstractclipblendnode.h
@@ -38,13 +38,13 @@
 #define QT3DANIMATION_QABSTRACTCLIPBLENDNODE_H
 
 #include <Qt3DAnimation/qt3danimation_global.h>
+#include <Qt3DAnimation/qabstractanimationclip.h>
 #include <Qt3DCore/qnode.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DAnimation {
 
-class QAbstractAnimationClip;
 class QAbstractClipBlendNodePrivate;
 
 class Q_3DANIMATIONSHARED_EXPORT QAbstractClipBlendNode : public Qt3DCore::QNode
diff --git a/src/animation/frontend/qblendedclipanimator.h b/src/animation/frontend/qblendedclipanimator.h
index 2fb7595aa..67f9551d6 100644
--- a/src/animation/frontend/qblendedclipanimator.h
+++ b/src/animation/frontend/qblendedclipanimator.h
@@ -42,12 +42,12 @@
 
 #include <Qt3DAnimation/qt3danimation_global.h>
 #include <Qt3DAnimation/qabstractclipanimator.h>
+#include <Qt3DAnimation/qabstractclipblendnode.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DAnimation {
 
-class QAbstractClipBlendNode;
 class QBlendedClipAnimatorPrivate;
 
 class Q_3DANIMATIONSHARED_EXPORT QBlendedClipAnimator : public Qt3DAnimation::QAbstractClipAnimator
diff --git a/src/animation/frontend/qclipanimator.h b/src/animation/frontend/qclipanimator.h
index 6025a5343..d3b789692 100644
--- a/src/animation/frontend/qclipanimator.h
+++ b/src/animation/frontend/qclipanimator.h
@@ -42,13 +42,12 @@
 
 #include <Qt3DAnimation/qt3danimation_global.h>
 #include <Qt3DAnimation/qabstractclipanimator.h>
+#include <Qt3DAnimation/qabstractanimationclip.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DAnimation {
 
-class QAbstractAnimationClip;
-class QChannelMapper;
 class QClipAnimatorPrivate;
 
 class Q_3DANIMATIONSHARED_EXPORT QClipAnimator : public Qt3DAnimation::QAbstractClipAnimator
diff --git a/src/animation/frontend/qskeletonmapping.h b/src/animation/frontend/qskeletonmapping.h
index 5f37bfeb9..e8fcb3f9a 100644
--- a/src/animation/frontend/qskeletonmapping.h
+++ b/src/animation/frontend/qskeletonmapping.h
@@ -40,15 +40,12 @@
 #ifndef QT3DANIMATION_QSKELETONMAPPING_H
 #define QT3DANIMATION_QSKELETONMAPPING_H
 
+#include <Qt3DCore/qabstractskeleton.h>
 #include <Qt3DAnimation/qabstractchannelmapping.h>
 #include <Qt3DAnimation/qt3danimation_global.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3DCore {
-class QAbstractSkeleton;
-}
-
 namespace Qt3DAnimation {
 
 class QSkeletonMappingPrivate;