summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2020-08-12 11:10:35 +0200
committerPaul Lemire <paul.lemire@kdab.com>2020-08-13 08:10:50 +0200
commita29273cba13e04b1334bc440ee0c028c0a7e708a (patch)
treec8b2d60da97f135b12256d985302918087011cb9
parent59ecf791fad243959d59ed8f5cb461c328cd474a (diff)
Fix missing override warning
Change-Id: I568ba2d39179f9b5b35190cf86c316788f903d6c Reviewed-by: Mike Krus <mike.krus@kdab.com>
-rw-r--r--tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp4
-rw-r--r--tests/auto/render/opengl/materialparametergathererjob/tst_materialparametergathererjob.cpp4
-rw-r--r--tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp4
-rw-r--r--tests/auto/render/opengl/textures/tst_textures.cpp4
-rw-r--r--tests/auto/render/segmentvisitor/tst_segmentvisitor.cpp2
-rw-r--r--tests/auto/render/trianglevisitor/tst_trianglevisitor.cpp2
-rw-r--r--tests/auto/render/updateshaderdatatransformjob/tst_updateshaderdatatransformjob.cpp4
7 files changed, 12 insertions, 12 deletions
diff --git a/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp b/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp
index 177de302a..8b9144c66 100644
--- a/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp
+++ b/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp
@@ -123,8 +123,8 @@ public:
return static_cast<Render::OpenGL::Renderer *>(d_func()->m_renderer);
}
- void onRegistered() { QRenderAspect::onRegistered(); }
- void onUnregistered() { QRenderAspect::onUnregistered(); }
+ void onRegistered() override { QRenderAspect::onRegistered(); }
+ void onUnregistered() override { QRenderAspect::onUnregistered(); }
private:
QScopedPointer<Qt3DCore::QAspectJobManager> m_jobManager;
diff --git a/tests/auto/render/opengl/materialparametergathererjob/tst_materialparametergathererjob.cpp b/tests/auto/render/opengl/materialparametergathererjob/tst_materialparametergathererjob.cpp
index 65e8d7ba8..73017bead 100644
--- a/tests/auto/render/opengl/materialparametergathererjob/tst_materialparametergathererjob.cpp
+++ b/tests/auto/render/opengl/materialparametergathererjob/tst_materialparametergathererjob.cpp
@@ -114,8 +114,8 @@ public:
return job;
}
- void onRegistered() { QRenderAspect::onRegistered(); }
- void onUnregistered() { QRenderAspect::onUnregistered(); }
+ void onRegistered() override { QRenderAspect::onRegistered(); }
+ void onUnregistered() override { QRenderAspect::onUnregistered(); }
private:
QScopedPointer<Qt3DCore::QAspectJobManager> m_jobManager;
diff --git a/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp b/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp
index fa7c4f32a..5c378c6d1 100644
--- a/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp
+++ b/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp
@@ -106,8 +106,8 @@ public:
return job;
}
- void onRegistered() { QRenderAspect::onRegistered(); }
- void onUnregistered() { QRenderAspect::onUnregistered(); }
+ void onRegistered() override { QRenderAspect::onRegistered(); }
+ void onUnregistered() override { QRenderAspect::onUnregistered(); }
private:
QScopedPointer<Qt3DCore::QAspectJobManager> m_jobManager;
diff --git a/tests/auto/render/opengl/textures/tst_textures.cpp b/tests/auto/render/opengl/textures/tst_textures.cpp
index 0a83edbd7..8eb338f90 100644
--- a/tests/auto/render/opengl/textures/tst_textures.cpp
+++ b/tests/auto/render/opengl/textures/tst_textures.cpp
@@ -150,7 +150,7 @@ public:
Qt3DRender::QAbstractTextureImage::notifyDataGeneratorChanged();
}
- Qt3DRender::QTextureImageDataGeneratorPtr dataGenerator() const
+ Qt3DRender::QTextureImageDataGeneratorPtr dataGenerator() const override
{
return Qt3DRender::QTextureImageDataGeneratorPtr(new TestImageDataGenerator(m_genId));
}
@@ -166,7 +166,7 @@ public:
{
}
- Qt3DRender::QTextureImageDataGeneratorPtr dataGenerator() const
+ Qt3DRender::QTextureImageDataGeneratorPtr dataGenerator() const override
{
return {};
}
diff --git a/tests/auto/render/segmentvisitor/tst_segmentvisitor.cpp b/tests/auto/render/segmentvisitor/tst_segmentvisitor.cpp
index 47d7b7420..729121f26 100644
--- a/tests/auto/render/segmentvisitor/tst_segmentvisitor.cpp
+++ b/tests/auto/render/segmentvisitor/tst_segmentvisitor.cpp
@@ -49,7 +49,7 @@ public:
}
- virtual void visit(uint andx, const Vector3D &a, uint bndx, const Vector3D &b)
+ void visit(uint andx, const Vector3D &a, uint bndx, const Vector3D &b) override
{
m_segments.push_back(TestSegment(andx, a, bndx, b));
}
diff --git a/tests/auto/render/trianglevisitor/tst_trianglevisitor.cpp b/tests/auto/render/trianglevisitor/tst_trianglevisitor.cpp
index f77fddfbf..39ac824f5 100644
--- a/tests/auto/render/trianglevisitor/tst_trianglevisitor.cpp
+++ b/tests/auto/render/trianglevisitor/tst_trianglevisitor.cpp
@@ -49,7 +49,7 @@ public:
}
- virtual void visit(uint andx, const Vector3D &a, uint bndx, const Vector3D &b, uint cndx, const Vector3D &c)
+ void visit(uint andx, const Vector3D &a, uint bndx, const Vector3D &b, uint cndx, const Vector3D &c) override
{
m_triangles.push_back(TestTriangle(andx, a, bndx, b, cndx, c));
}
diff --git a/tests/auto/render/updateshaderdatatransformjob/tst_updateshaderdatatransformjob.cpp b/tests/auto/render/updateshaderdatatransformjob/tst_updateshaderdatatransformjob.cpp
index 1283a91aa..805b6c064 100644
--- a/tests/auto/render/updateshaderdatatransformjob/tst_updateshaderdatatransformjob.cpp
+++ b/tests/auto/render/updateshaderdatatransformjob/tst_updateshaderdatatransformjob.cpp
@@ -107,8 +107,8 @@ public:
QRenderAspect::onUnregistered();
}
- void onRegistered() { Qt3DRender::QRenderAspect::onRegistered(); }
- void onUnregistered() { Qt3DRender::QRenderAspect::onUnregistered(); }
+ void onRegistered() override { Qt3DRender::QRenderAspect::onRegistered(); }
+ void onUnregistered() override { Qt3DRender::QRenderAspect::onUnregistered(); }
Qt3DRender::Render::NodeManagers *nodeManagers() const { return d_func()->m_renderer->nodeManagers(); }
Qt3DRender::Render::FrameGraphNode *frameGraphRoot() const { return d_func()->m_renderer->frameGraphRoot(); }