Minor fixes to compile against 5.15

Change-Id: Id9574cf23b9af29815d8452915cebfc380fd94d1
Reviewed-by: Mike Krus <mike.krus@kdab.com>

8 files changed, 32 insertions, 5 deletions

diff --git a/tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp b/tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp
index d545dc616..b8e0c5357 100644
--- a/tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp
+++ b/tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp
@@ -30,6 +30,7 @@
 #include <QList>
 #include <Qt3DCore/private/qhandle_p.h>
 #include <Qt3DCore/private/qresourcemanager_p.h>
+#include <QThread>
 
 class tst_QResourceManager : public QObject
 {
diff --git a/tests/auto/global/aspects_startup_shutdown/tst_aspects_startup_shutdown.cpp b/tests/auto/global/aspects_startup_shutdown/tst_aspects_startup_shutdown.cpp
index fbe58bd0d..bc4eed557 100644
--- a/tests/auto/global/aspects_startup_shutdown/tst_aspects_startup_shutdown.cpp
+++ b/tests/auto/global/aspects_startup_shutdown/tst_aspects_startup_shutdown.cpp
@@ -72,6 +72,7 @@
 #include <Qt3DExtras/QTorusMesh>
 
 #include <QPropertyAnimation>
+#include <QThread>
 
 namespace {
 
diff --git a/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp b/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp
index fe87f21b7..2b1aa2b8f 100644
--- a/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp
+++ b/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp
@@ -36,7 +36,10 @@
 #include <QOpenGLShaderProgram>
 #include <QOpenGLVertexArrayObject>
 #include <QSurfaceFormat>
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 #include <QtOpenGL/QOpenGLVersionFunctionsFactory>
+#endif
 
 #if !QT_CONFIG(opengles2) && defined(QT_OPENGL_4_3)
 
@@ -256,7 +259,11 @@ private Q_SLOTS:
             return;
         }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
         if ((m_func = QOpenGLVersionFunctionsFactory::get<QOpenGLFunctions_4_3_Core>()) != nullptr) {
+#else
+        if ((m_func = m_glContext.versionFunctions<QOpenGLFunctions_4_3_Core>()) != nullptr) {
+#endif
             m_glHelper.initializeHelper(&m_glContext, m_func);
             m_initializationSuccessful = true;
         }
@@ -924,7 +931,11 @@ private Q_SLOTS:
         QVERIFY(error == 0);
 
         // THEN
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
         QList<QVector4D> colors(512 * 512);
+#else
+        QVector<QVector4D> colors(512 * 512);
+#endif
         textures[3]->bind();
         m_func->glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_FLOAT, colors.data());
         textures[3]->release();
diff --git a/tests/auto/render/render.pro b/tests/auto/render/render.pro
index dbc724074..b7381b9f3 100644
--- a/tests/auto/render/render.pro
+++ b/tests/auto/render/render.pro
@@ -156,7 +156,7 @@ qtConfig(qt3d-opengl-renderer):qtConfig(private_tests) {
     qtConfig(qt3d-simd-sse2):!qtConfig(qt3d-simd-avx2): SUBDIRS += alignedresourcesmanagers-sse
 }
 
-qtConfig(qt3d-rhi-renderer):qtConfig(private_tests) {
+qtConfig(qt3d-rhi-renderer):qtConfig(private_tests):qtHaveModule(shadertools) {
 
     SUBDIRS += \
         rhi
diff --git a/tests/auto/render/vsyncframeadvanceservice/tst_vsyncframeadvanceservice.cpp b/tests/auto/render/vsyncframeadvanceservice/tst_vsyncframeadvanceservice.cpp
index e301ecb8d..806adff6b 100644
--- a/tests/auto/render/vsyncframeadvanceservice/tst_vsyncframeadvanceservice.cpp
+++ b/tests/auto/render/vsyncframeadvanceservice/tst_vsyncframeadvanceservice.cpp
@@ -28,7 +28,7 @@
 
 #include <QtTest/QTest>
 #include <QSemaphore>
-
+#include <QThread>
 #include <Qt3DRender/private/vsyncframeadvanceservice_p.h>
 
 class FakeRenderThread final : public QThread
diff --git a/tests/manual/sharedtexture/sharedtexture.pro b/tests/manual/sharedtexture/sharedtexture.pro
index 72b5bed68..51faf69e2 100644
--- a/tests/manual/sharedtexture/sharedtexture.pro
+++ b/tests/manual/sharedtexture/sharedtexture.pro
@@ -2,7 +2,11 @@
     error( "Couldn't find the manual.pri file!" )
 }
 
-QT += widgets 3dcore 3drender 3dinput 3dextras multimedia opengl openglwidgets
+QT += widgets 3dcore 3drender 3dinput 3dextras multimedia opengl
+
+greaterThan(QT_MAJOR_VERSION, 5) {
+    QT += openglwidgets
+}
 
 SOURCES += \
     videoplayer.cpp \
diff --git a/tests/manual/sharedtexture/videoplayer.h b/tests/manual/sharedtexture/videoplayer.h
index b34f3ea78..d609b06d6 100644
--- a/tests/manual/sharedtexture/videoplayer.h
+++ b/tests/manual/sharedtexture/videoplayer.h
@@ -48,8 +48,14 @@
 **
 ****************************************************************************/
 
-#include <QtOpenGLWidgets/QOpenGLWidget>
 #include <QtGui/QOpenGLFunctions>
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <QtOpenGLWidgets/QOpenGLWidget>
+#else
+#include <QtWidgets/QOpenGLWidget>
+#endif
+
 #include <QOpenGLVertexArrayObject>
 #include <QOpenGLBuffer>
 #include <QOpenGLTexture>
diff --git a/tests/manual/sharedtextureqml/sharedtextureqml.pro b/tests/manual/sharedtextureqml/sharedtextureqml.pro
index 7c2086013..3fbd2e95a 100644
--- a/tests/manual/sharedtextureqml/sharedtextureqml.pro
+++ b/tests/manual/sharedtextureqml/sharedtextureqml.pro
@@ -2,7 +2,11 @@
     error( "Couldn't find the manual.pri file!" )
 }
 
-QT += widgets gui-private 3dcore 3drender 3dinput 3dextras multimedia quick 3dquickextras openglwidgets
+QT += widgets gui-private 3dcore 3drender 3dinput 3dextras multimedia quick 3dquickextras
+
+greaterThan(QT_MAJOR_VERSION, 5) {
+    QT += openglwidgets
+}
 
 SOURCES += \
     main.cpp \