Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: I9e9214906c5cda56d0bcc98678c77be69189699d

2 files changed, 4 insertions, 3 deletions

diff --git a/tests/auto/core/qentity/tst_qentity.cpp b/tests/auto/core/qentity/tst_qentity.cpp
index d7847342b..04f695953 100644
--- a/tests/auto/core/qentity/tst_qentity.cpp
+++ b/tests/auto/core/qentity/tst_qentity.cpp
@@ -73,7 +73,7 @@ class MyQComponent : public Qt3DCore::QComponent
 {
     Q_OBJECT
 public:
-    explicit MyQComponent(Qt3DCore::QNode *parent = 0)
+    explicit MyQComponent(Qt3DCore::QNode *parent = nullptr)
         : QComponent(parent)
     {}
 };
@@ -90,7 +90,7 @@ public:
 class MyEntity : public Qt3DCore::QEntity
 {
 public:
-    explicit MyEntity(Qt3DCore::QNode *parent = 0)
+    explicit MyEntity(Qt3DCore::QNode *parent = nullptr)
         : QEntity(parent)
     {}
 };
@@ -622,6 +622,8 @@ void tst_Entity::checkCloning_data()
         Qt3DCore::QEntity *grandChild = new MyEntity(entityWithNestedChildren);
         QVector<QNodeId> childIds = {child->id(), grandChild->id()};
         QTest::newRow("entityWithNestedChildren") << entityWithNestedChildren << childIds << 4;
+
+        Q_UNUSED(dummy);
     }
 }
 
diff --git a/tests/auto/render/textures/tst_textures.cpp b/tests/auto/render/textures/tst_textures.cpp
index 390853e77..41e438d01 100644
--- a/tests/auto/render/textures/tst_textures.cpp
+++ b/tests/auto/render/textures/tst_textures.cpp
@@ -454,7 +454,6 @@ private Q_SLOTS:
     {
         // GIVEN
         QScopedPointer<Qt3DRender::Render::NodeManagers> mgrs(new Qt3DRender::Render::NodeManagers());
-        Qt3DRender::Render::TextureManager *texMgr = mgrs->textureManager();
         Qt3DRender::Render::TextureImageDataManager *texImgDataMgr = mgrs->textureImageDataManager();
 
         TestTextureImage img(1);