Update dependencies

- Fix build for change in QML private syntax and relocation of OpenGL headers
- Fix some deprecation warnings
- Update include paths
- Update module dependencies

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

29 files changed, 40 insertions, 44 deletions

diff --git a/dependencies.yaml b/dependencies.yaml
index a297d4f42..3987d7398 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,13 +1,13 @@
 dependencies:
   ../qtbase:
-    ref: 123cf74dd00307478ac72ec4fd34d9198a603379
+    ref: a13e8d6660913bec172d1374f78083498c539df0
     required: true
   ../qtdeclarative:
-    ref: f215d00f601f66c15e0d4b2951223bc6f7e3ea5e
+    ref: 94d385327d932d27b7277e803d0eaa167f792222
     required: false
   ../qtgamepad:
-    ref: 76b7134943ef6cbc0651318605c59ea339df0a88
+    ref: 3bf17cf8782d0cf38daaf6fc8afdd33517d382b0
     required: false
   ../qtimageformats:
-    ref: aa95facc95aa375b16243ab15a6cf4d6c4e78a60
+    ref: eb02e051725510dea7daf0d035ef635efbb6b993
     required: false
diff --git a/examples/qt3d/audio-visualizer-qml/main.cpp b/examples/qt3d/audio-visualizer-qml/main.cpp
index c3fe2c009..5759dfe71 100644
--- a/examples/qt3d/audio-visualizer-qml/main.cpp
+++ b/examples/qt3d/audio-visualizer-qml/main.cpp
@@ -50,7 +50,7 @@
 
 #include "touchsettings.h"
 #include <QtGui/QGuiApplication>
-#include <QtGui/QOpenGLContext>
+#include <QOpenGLContext>
 #include <QtQuick/QQuickView>
 #include <QtQuick/QQuickItem>
 #include <QtQml/QQmlContext>
diff --git a/src/animation/backend/channelmapping.cpp b/src/animation/backend/channelmapping.cpp
index 83e7322da..cf4511279 100644
--- a/src/animation/backend/channelmapping.cpp
+++ b/src/animation/backend/channelmapping.cpp
@@ -59,7 +59,6 @@ ChannelMapping::ChannelMapping()
     , m_componentCount(0)
     , m_propertyName(nullptr)
     , m_callback(nullptr)
-    , m_callbackFlags(0)
     , m_skeletonId()
     , m_mappingType(MappingType::ChannelMappingType)
 {
@@ -74,7 +73,7 @@ void ChannelMapping::cleanup()
     m_propertyName = nullptr;
     m_componentCount = 0;
     m_callback = nullptr;
-    m_callbackFlags = 0;
+    m_callbackFlags = {};
     m_skeletonId = Qt3DCore::QNodeId();
 }
 
diff --git a/src/animation/backend/gltfimporter.cpp b/src/animation/backend/gltfimporter.cpp
index ff42507f2..521a0742d 100644
--- a/src/animation/backend/gltfimporter.cpp
+++ b/src/animation/backend/gltfimporter.cpp
@@ -39,7 +39,7 @@
 #include <Qt3DAnimation/private/fcurve_p.h>
 #include <Qt3DAnimation/private/keyframe_p.h>
 
-#include <QtGui/qopengl.h>
+#include <qopengl.h>
 #include <QtGui/qquaternion.h>
 #include <QtGui/qvector2d.h>
 #include <QtGui/qvector3d.h>
diff --git a/src/animation/frontend/qcallbackmapping.cpp b/src/animation/frontend/qcallbackmapping.cpp
index 53f7a5e33..435191b2d 100644
--- a/src/animation/frontend/qcallbackmapping.cpp
+++ b/src/animation/frontend/qcallbackmapping.cpp
@@ -51,7 +51,6 @@ QCallbackMappingPrivate::QCallbackMappingPrivate()
     , m_channelName()
     , m_type(static_cast<int>(QVariant::Invalid))
     , m_callback(nullptr)
-    , m_callbackFlags(0)
 {
     m_mappingType = QChannelMappingCreatedChangeBase::CallbackMapping;
 }
diff --git a/src/extras/defaults/qt3dwindow.cpp b/src/extras/defaults/qt3dwindow.cpp
index ace40c3c1..b373127b0 100644
--- a/src/extras/defaults/qt3dwindow.cpp
+++ b/src/extras/defaults/qt3dwindow.cpp
@@ -60,7 +60,7 @@
 #include <Qt3DInput/qinputsettings.h>
 #include <Qt3DLogic/qlogicaspect.h>
 #include <Qt3DRender/qcamera.h>
-#include <QtGui/qopenglcontext.h>
+#include <qopenglcontext.h>
 #include <private/qrendersettings_p.h>
 
 #include <QEvent>
diff --git a/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp b/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp
index 583b0ec58..19b06a8b0 100644
--- a/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp
+++ b/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp
@@ -44,7 +44,7 @@
 #include <QtCore/QJsonObject>
 #include <QtCore/QVersionNumber>
 
-#include <QtGui/QOpenGLTexture>
+#include <QOpenGLTexture>
 
 #include <Qt3DRender/QGeometry>
 #include <Qt3DRender/private/renderlogging_p.h>
diff --git a/src/quick3d/imports/scene3d/scene3drenderer.cpp b/src/quick3d/imports/scene3d/scene3drenderer.cpp
index 1e375ccbb..98e735048 100644
--- a/src/quick3d/imports/scene3d/scene3drenderer.cpp
+++ b/src/quick3d/imports/scene3d/scene3drenderer.cpp
@@ -42,8 +42,8 @@
 #include <Qt3DCore/qaspectengine.h>
 #include <Qt3DRender/qrenderaspect.h>
 #include <QtCore/qthread.h>
-#include <QtGui/qopenglcontext.h>
-#include <QtGui/qopenglframebufferobject.h>
+#include <qopenglcontext.h>
+#include <qopenglframebufferobject.h>
 #include <QtQuick/qquickwindow.h>
 
 #include <Qt3DRender/private/qrenderaspect_p.h>
diff --git a/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp b/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp
index 55538ad1f..27007899d 100644
--- a/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp
+++ b/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp
@@ -39,8 +39,8 @@
 
 #include "scene3dsgmaterialshader_p.h"
 
-#include <QtGui/qopenglcontext.h>
-#include <QtGui/qopenglfunctions.h>
+#include <qopenglcontext.h>
+#include <qopenglfunctions.h>
 #include <QtGui/qsurfaceformat.h>
 
 #include <scene3dsgmaterial_p.h>
diff --git a/src/quick3d/quick3d/qt3dquicknodefactory.cpp b/src/quick3d/quick3d/qt3dquicknodefactory.cpp
index 1a37f9acc..87069a10e 100644
--- a/src/quick3d/quick3d/qt3dquicknodefactory.cpp
+++ b/src/quick3d/quick3d/qt3dquicknodefactory.cpp
@@ -64,7 +64,7 @@ QNode *QuickNodeFactory::createNode(const char *type)
 
     if (!typeInfo.resolved) {
         typeInfo.resolved = true;
-        typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), typeInfo.version.first, typeInfo.version.second);
+        typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), QTypeRevision::fromVersion(typeInfo.version.first, typeInfo.version.second));
     }
 
     return typeInfo.t.isValid() ? qobject_cast<QNode *>(typeInfo.t.create()) : nullptr;
diff --git a/src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp b/src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp
index 879389bd9..b31b3048e 100644
--- a/src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp
+++ b/src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp
@@ -64,7 +64,7 @@ Qt3DCore::QNode *QuickAnimationNodeFactory::createNode(const char *type)
 
     if (!typeInfo.resolved) {
         typeInfo.resolved = true;
-        typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), typeInfo.version.first, typeInfo.version.second);
+        typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), QTypeRevision::fromVersion(typeInfo.version.first, typeInfo.version.second));
     }
 
     return typeInfo.t.isValid() ? qobject_cast<Qt3DCore::QNode *>(typeInfo.t.create()) : nullptr;
diff --git a/src/quick3d/quick3dextras/qt3dquickextrasnodefactory.cpp b/src/quick3d/quick3dextras/qt3dquickextrasnodefactory.cpp
index 2e1f993f9..8897a6b75 100644
--- a/src/quick3d/quick3dextras/qt3dquickextrasnodefactory.cpp
+++ b/src/quick3d/quick3dextras/qt3dquickextrasnodefactory.cpp
@@ -64,7 +64,7 @@ Qt3DCore::QNode *QuickExtrasNodeFactory::createNode(const char *type)
 
     if (!typeInfo.resolved) {
         typeInfo.resolved = true;
-        typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), typeInfo.version.first, typeInfo.version.second);
+        typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), QTypeRevision::fromVersion(typeInfo.version.first, typeInfo.version.second));
     }
 
     return typeInfo.t.isValid() ? qobject_cast<Qt3DCore::QNode *>(typeInfo.t.create()) : nullptr;
diff --git a/src/quick3d/quick3dextras/qt3dquickwindow.cpp b/src/quick3d/quick3dextras/qt3dquickwindow.cpp
index d67dfdc71..773e9ca94 100644
--- a/src/quick3d/quick3dextras/qt3dquickwindow.cpp
+++ b/src/quick3d/quick3dextras/qt3dquickwindow.cpp
@@ -60,7 +60,7 @@
 #include <Qt3DRender/qrendersurfaceselector.h>
 #include <QtGui/QGuiApplication>
 #include <QtGui/QScreen>
-#include <QtGui/qopenglcontext.h>
+#include <qopenglcontext.h>
 #include <QtQml/QQmlContext>
 #include <QtQml/qqmlincubator.h>
 
diff --git a/src/quick3d/quick3dinput/qt3dquickinputnodefactory.cpp b/src/quick3d/quick3dinput/qt3dquickinputnodefactory.cpp
index 0692b15d6..8b2e4d557 100644
--- a/src/quick3d/quick3dinput/qt3dquickinputnodefactory.cpp
+++ b/src/quick3d/quick3dinput/qt3dquickinputnodefactory.cpp
@@ -64,7 +64,7 @@ Qt3DCore::QNode *QuickInputNodeFactory::createNode(const char *type)
 
     if (!typeInfo.resolved) {
         typeInfo.resolved = true;
-        typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), typeInfo.version.first, typeInfo.version.second);
+        typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), QTypeRevision::fromVersion(typeInfo.version.first, typeInfo.version.second));
     }
 
     return typeInfo.t.isValid() ? qobject_cast<Qt3DCore::QNode *>(typeInfo.t.create()) : nullptr;
diff --git a/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp b/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp
index a4f786a76..f146bbe4e 100644
--- a/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp
+++ b/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp
@@ -64,7 +64,7 @@ Qt3DCore::QNode *QuickRenderNodeFactory::createNode(const char *type)
 
     if (!typeInfo.resolved) {
         typeInfo.resolved = true;
-        typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), typeInfo.version.first, typeInfo.version.second);
+        typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), QTypeRevision::fromVersion(typeInfo.version.first, typeInfo.version.second));
     }
 
     return typeInfo.t.isValid() ? qobject_cast<Qt3DCore::QNode *>(typeInfo.t.create()) : nullptr;
diff --git a/src/quick3d/quick3dscene2d/qt3dquickscene2dnodefactory.cpp b/src/quick3d/quick3dscene2d/qt3dquickscene2dnodefactory.cpp
index 417b28ea0..f757b0bbc 100644
--- a/src/quick3d/quick3dscene2d/qt3dquickscene2dnodefactory.cpp
+++ b/src/quick3d/quick3dscene2d/qt3dquickscene2dnodefactory.cpp
@@ -77,7 +77,7 @@ Qt3DCore::QNode *QuickScene2DNodeFactory::createNode(const char *type)
     if (!typeInfo.resolved) {
         typeInfo.resolved = true;
         typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName),
-                                           typeInfo.version.first, typeInfo.version.second);
+                                           QTypeRevision::fromVersion(typeInfo.version.first, typeInfo.version.second));
     }
 
     return typeInfo.t.isValid() ? qobject_cast<Qt3DCore::QNode *>(typeInfo.t.create()) : nullptr;
diff --git a/src/render/backend/abstractrenderer_p.h b/src/render/backend/abstractrenderer_p.h
index b618eda55..f53ba04ba 100644
--- a/src/render/backend/abstractrenderer_p.h
+++ b/src/render/backend/abstractrenderer_p.h
@@ -58,7 +58,7 @@
 #include <Qt3DCore/qnodeid.h>
 #include <QtGui/qsurfaceformat.h>
 
-#include <QtGui/qopenglcontext.h>
+#include <qopenglcontext.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/geometry/gltfskeletonloader.cpp b/src/render/geometry/gltfskeletonloader.cpp
index 7827bce02..c152605dc 100644
--- a/src/render/geometry/gltfskeletonloader.cpp
+++ b/src/render/geometry/gltfskeletonloader.cpp
@@ -36,7 +36,7 @@
 
 #include "gltfskeletonloader_p.h"
 
-#include <QtGui/qopengl.h>
+#include <qopengl.h>
 #include <QtCore/qdir.h>
 #include <QtCore/qfile.h>
 #include <QtCore/qfileinfo.h>
diff --git a/src/render/renderers/opengl/opengl.pri b/src/render/renderers/opengl/opengl.pri
index 4b0d8c36b..150c37f23 100644
--- a/src/render/renderers/opengl/opengl.pri
+++ b/src/render/renderers/opengl/opengl.pri
@@ -1,4 +1,4 @@
-qtHaveModule(opengl): QT += opengl
+qtHaveModule(opengl): QT += opengl opengl-private
 
 include (renderer/renderer.pri)
 include (jobs/jobs.pri)
diff --git a/src/render/renderers/opengl/textures/renderbuffer.cpp b/src/render/renderers/opengl/textures/renderbuffer.cpp
index bc5050f73..19d8cfcd7 100644
--- a/src/render/renderers/opengl/textures/renderbuffer.cpp
+++ b/src/render/renderers/opengl/textures/renderbuffer.cpp
@@ -38,8 +38,8 @@
 ****************************************************************************/
 
 #include "renderbuffer_p.h"
-#include <QtGui/QOpenGLContext>
-#include <QtGui/QOpenGLFunctions>
+#include <QOpenGLContext>
+#include <QOpenGLFunctions>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/texture/qtextureimagedata.h b/src/render/texture/qtextureimagedata.h
index 68ceebabc..5bc71480e 100644
--- a/src/render/texture/qtextureimagedata.h
+++ b/src/render/texture/qtextureimagedata.h
@@ -40,7 +40,7 @@
 #ifndef QT3DRENDER_TEXTUREIMAGEDATA_H
 #define QT3DRENDER_TEXTUREIMAGEDATA_H
 
-#include <QtGui/QOpenGLTexture>
+#include <QOpenGLTexture>
 #include <QtGui/QImage>
 #include <QtCore/QSharedPointer>
 #include <Qt3DRender/qt3drender_global.h>
diff --git a/tests/auto/animation/animationutils/tst_animationutils.cpp b/tests/auto/animation/animationutils/tst_animationutils.cpp
index 385398bd1..463656557 100644
--- a/tests/auto/animation/animationutils/tst_animationutils.cpp
+++ b/tests/auto/animation/animationutils/tst_animationutils.cpp
@@ -1047,7 +1047,7 @@ private Q_SLOTS:
             mapping.type = static_cast<int>(QVariant::Vector3D);
             mapping.channelIndices = QVector<int>() << 0 << 1 << 2;
             mapping.callback = &callback;
-            mapping.callbackFlags = 0;
+            mapping.callbackFlags = {};
             mappingData.push_back(mapping);
             channelResults = QVector<float>() << 1.0f << 2.0f << 3.0f;
 
@@ -1073,7 +1073,7 @@ private Q_SLOTS:
             mapping.type = static_cast<int>(QVariant::Double);
             mapping.channelIndices = QVector<int>() << 0;
             mapping.callback = &callback;
-            mapping.callbackFlags = 0;
+            mapping.callbackFlags = {};
             mappingData.push_back(mapping);
             channelResults = QVector<float>() << 1.0f;
 
diff --git a/tests/auto/core/threadpooler/tst_threadpooler.cpp b/tests/auto/core/threadpooler/tst_threadpooler.cpp
index a656c25c1..cfe3480ee 100644
--- a/tests/auto/core/threadpooler/tst_threadpooler.cpp
+++ b/tests/auto/core/threadpooler/tst_threadpooler.cpp
@@ -195,13 +195,13 @@ void tst_ThreadPooler::defaultPerThread()
     // GIVEN
     QAtomicInt callCounter;
     int maxThreadCount = QThread::idealThreadCount();
-    callCounter.store(0);
+    callCounter.storeRelaxed(0);
 
     // WHEN
     m_jobManager->waitForPerThreadFunction(perThreadFunction, &callCounter);
 
     // THEN
-    QVERIFY(maxThreadCount == callCounter.load());
+    QVERIFY(maxThreadCount == callCounter.loadRelaxed());
 }
 
 void tst_ThreadPooler::defaultAspectQueue()
@@ -210,7 +210,7 @@ void tst_ThreadPooler::defaultAspectQueue()
     QAtomicInt callCounter;
     int value = 0; // Not used in this test
     QVector<QSharedPointer<Qt3DCore::QAspectJob> > jobList;
-    callCounter.store(0);
+    callCounter.storeRelaxed(0);
     const int jobCount = 5;
 
     // WHEN
@@ -223,7 +223,7 @@ void tst_ThreadPooler::defaultAspectQueue()
     m_jobManager->waitForAllJobs();
 
     // THEN
-    QVERIFY(jobCount == callCounter.load());
+    QVERIFY(jobCount == callCounter.loadRelaxed());
 }
 
 /*
@@ -236,7 +236,7 @@ void tst_ThreadPooler::doubleAspectQueue()
     QAtomicInt callCounter;
     int value = 0; // Not used in this test
     QVector<QSharedPointer<Qt3DCore::QAspectJob> > jobList;
-    callCounter.store(0);
+    callCounter.storeRelaxed(0);
     const int jobCount = 3;
 
     // WHEN
@@ -258,7 +258,7 @@ void tst_ThreadPooler::doubleAspectQueue()
     m_jobManager->waitForAllJobs();
 
     // THEN
-    QVERIFY(jobCount * 2 == callCounter.load());
+    QVERIFY(jobCount * 2 == callCounter.loadRelaxed());
 }
 
 /*
@@ -335,7 +335,7 @@ public:
 
     quint64 globalAtomicValue() const
     {
-        return m_globalAtomic.load();
+        return m_globalAtomic.loadRelaxed();
     }
 
 private:
diff --git a/tests/auto/extras/qcuboidgeometry/tst_qcuboidgeometry.cpp b/tests/auto/extras/qcuboidgeometry/tst_qcuboidgeometry.cpp
index 973a1d613..838e5dea9 100644
--- a/tests/auto/extras/qcuboidgeometry/tst_qcuboidgeometry.cpp
+++ b/tests/auto/extras/qcuboidgeometry/tst_qcuboidgeometry.cpp
@@ -32,7 +32,7 @@
 #include <Qt3DRender/qattribute.h>
 #include <Qt3DRender/qbuffer.h>
 #include <Qt3DRender/qbufferdatagenerator.h>
-#include <QtGui/qopenglcontext.h>
+#include <qopenglcontext.h>
 #include <QtGui/qvector2d.h>
 #include <QtGui/qvector3d.h>
 #include <QtGui/qvector4d.h>
diff --git a/tests/auto/extras/qtorusgeometry/tst_qtorusgeometry.cpp b/tests/auto/extras/qtorusgeometry/tst_qtorusgeometry.cpp
index 28fe76ae9..bf5651c9c 100644
--- a/tests/auto/extras/qtorusgeometry/tst_qtorusgeometry.cpp
+++ b/tests/auto/extras/qtorusgeometry/tst_qtorusgeometry.cpp
@@ -32,7 +32,7 @@
 #include <Qt3DRender/qattribute.h>
 #include <Qt3DRender/qbuffer.h>
 #include <Qt3DRender/qbufferdatagenerator.h>
-#include <QtGui/qopenglcontext.h>
+#include <qopenglcontext.h>
 #include <QtGui/qvector2d.h>
 #include <QtGui/qvector3d.h>
 #include <QtGui/qvector4d.h>
diff --git a/tests/auto/render/proximityfiltering/tst_proximityfiltering.cpp b/tests/auto/render/proximityfiltering/tst_proximityfiltering.cpp
index 1bed9fc44..7ff54f6fa 100644
--- a/tests/auto/render/proximityfiltering/tst_proximityfiltering.cpp
+++ b/tests/auto/render/proximityfiltering/tst_proximityfiltering.cpp
@@ -50,7 +50,7 @@ Qt3DCore::QEntity *buildEntityAtDistance(float distance, Qt3DCore::QEntity *pare
 
     // create geometry with a valid bounding volume - a single point is sufficient
     auto geometry = new Qt3DRender::QGeometry;
-    auto vertexBuffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::VertexBuffer, geometry);
+    auto vertexBuffer = new Qt3DRender::QBuffer(geometry);
 
     auto positionAttribute = new Qt3DRender::QAttribute;
     positionAttribute->setName(Qt3DRender::QAttribute::defaultPositionAttributeName());
diff --git a/tests/auto/render/qframegraphnode/tst_qframegraphnode.cpp b/tests/auto/render/qframegraphnode/tst_qframegraphnode.cpp
index 24febdac4..6116e031e 100644
--- a/tests/auto/render/qframegraphnode/tst_qframegraphnode.cpp
+++ b/tests/auto/render/qframegraphnode/tst_qframegraphnode.cpp
@@ -94,7 +94,7 @@ private Q_SLOTS:
         {
             Qt3DRender::QFrameGraphNode *nodeWithNestedChildren = new MyFrameGraphNode();
             Qt3DRender::QFrameGraphNode *child = new MyFrameGraphNode(nodeWithNestedChildren);
-            Qt3DCore::QNode *dummy = new Qt3DCore::QNode(nodeWithNestedChildren);
+            new Qt3DCore::QNode(nodeWithNestedChildren);
             Qt3DRender::QFrameGraphNode *grandChild = new MyFrameGraphNode(nodeWithNestedChildren);
             QVector<Qt3DCore::QNodeId> childIds = {child->id(), grandChild->id()};
             QTest::newRow("nodeWithNestedChildren") << nodeWithNestedChildren << childIds << true << 4;
diff --git a/tests/auto/render/qgraphicsapifilter/tst_qgraphicsapifilter.cpp b/tests/auto/render/qgraphicsapifilter/tst_qgraphicsapifilter.cpp
index bbc5219f8..ea14c27bb 100644
--- a/tests/auto/render/qgraphicsapifilter/tst_qgraphicsapifilter.cpp
+++ b/tests/auto/render/qgraphicsapifilter/tst_qgraphicsapifilter.cpp
@@ -29,7 +29,7 @@
 #include <QtTest/QTest>
 #include <QObject>
 #include <Qt3DRender/qgraphicsapifilter.h>
-#include <QtGui/qopenglcontext.h>
+#include <qopenglcontext.h>
 #include <QtCore/qsharedpointer.h>
 #include <QSignalSpy>
 
diff --git a/tests/auto/render/qsetfence/tst_qsetfence.cpp b/tests/auto/render/qsetfence/tst_qsetfence.cpp
index c602e6f5c..f5989fcd4 100644
--- a/tests/auto/render/qsetfence/tst_qsetfence.cpp
+++ b/tests/auto/render/qsetfence/tst_qsetfence.cpp
@@ -153,7 +153,6 @@ private Q_SLOTS:
             QCOMPARE(creationChanges.size(), 1);
 
             const auto creationChangeData = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DRender::QSetFenceData>>(creationChanges.first());
-            const Qt3DRender::QSetFenceData cloneData = creationChangeData->data;
 
             QCOMPARE(setFence.id(), creationChangeData->subjectId());
             QCOMPARE(setFence.isEnabled(), true);
@@ -174,7 +173,6 @@ private Q_SLOTS:
             QCOMPARE(creationChanges.size(), 1);
 
             const auto creationChangeData = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DRender::QSetFenceData>>(creationChanges.first());
-            const Qt3DRender::QSetFenceData cloneData = creationChangeData->data;
 
             QCOMPARE(setFence.id(), creationChangeData->subjectId());
             QCOMPARE(setFence.isEnabled(), false);