summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2020-08-18 10:41:03 +0200
committerPaul Lemire <paul.lemire@kdab.com>2020-08-18 16:36:14 +0200
commit25ac41ad815aada8470e9a6689ac4c86bd3d4a22 (patch)
tree9abc62f562d309a7dfa669f0fdc9d04bfc7c7b46 /tests
parent30e2c852c03d3aa4cd7ad29abdd48c2bd7103983 (diff)
Fix compile warnings
Change-Id: I4fbded297c1988b3ace17f6675527a0a00db8973 Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp4
-rw-r--r--tests/auto/core/qscheduler/tst_qscheduler.cpp4
-rw-r--r--tests/auto/input/utils/tst_utils.cpp4
-rw-r--r--tests/auto/render/entity/tst_entity.cpp4
-rw-r--r--tests/auto/render/qcamera/tst_qcamera.cpp4
-rw-r--r--tests/manual/paintedtexture-cpp/scene.cpp2
-rw-r--r--tests/manual/rendercapture-qml-fbo/rendercaptureprovider.h2
-rw-r--r--tests/manual/rendercapture-qml/rendercaptureprovider.h2
8 files changed, 13 insertions, 13 deletions
diff --git a/tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp b/tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp
index 97f35b880..5aa5f7548 100644
--- a/tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp
+++ b/tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp
@@ -243,7 +243,7 @@ public:
// QThread interface
protected:
- void run()
+ void run() override
{
int i = 0;
int max = 65535;
@@ -313,7 +313,7 @@ public:
// QThread interface
protected:
- void run()
+ void run() override
{
int i = 0;
int max = 65535;
diff --git a/tests/auto/core/qscheduler/tst_qscheduler.cpp b/tests/auto/core/qscheduler/tst_qscheduler.cpp
index b3ef21c17..a0df4b935 100644
--- a/tests/auto/core/qscheduler/tst_qscheduler.cpp
+++ b/tests/auto/core/qscheduler/tst_qscheduler.cpp
@@ -44,7 +44,7 @@ class JobPrivate : public QAspectJobPrivate
public:
// QAspectJobPrivate interface
- void postFrame(QAspectManager *aspectManager)
+ void postFrame(QAspectManager *aspectManager) override
{
Q_ASSERT(aspectManager);
m_postFrameCalled = true;
@@ -129,7 +129,7 @@ public:
private:
// QAbstractAspect interface
- std::vector<QAspectJobPtr> jobsToExecute(qint64)
+ std::vector<QAspectJobPtr> jobsToExecute(qint64) override
{
return { m_first, m_second };
}
diff --git a/tests/auto/input/utils/tst_utils.cpp b/tests/auto/input/utils/tst_utils.cpp
index 87c5cd6a0..5e791b99e 100644
--- a/tests/auto/input/utils/tst_utils.cpp
+++ b/tests/auto/input/utils/tst_utils.cpp
@@ -43,8 +43,8 @@ public:
FakeBackendDevice()
: Qt3DInput::QAbstractPhysicalDeviceBackendNode(Qt3DCore::QBackendNode::ReadOnly)
{}
- float axisValue(int) const { return 0.0f; }
- bool isButtonPressed(int) const { return false; }
+ float axisValue(int) const override { return 0.0f; }
+ bool isButtonPressed(int) const override { return false; }
};
class FakeInputDeviceIntegration : public Qt3DInput::QInputDeviceIntegration
diff --git a/tests/auto/render/entity/tst_entity.cpp b/tests/auto/render/entity/tst_entity.cpp
index f81bc5c92..d14142ca0 100644
--- a/tests/auto/render/entity/tst_entity.cpp
+++ b/tests/auto/render/entity/tst_entity.cpp
@@ -74,7 +74,7 @@ public:
CompleteVisitor(NodeManagers *manager) : EntityVisitor(manager) { }
int count = 0;
- Operation visit(Entity *) { count++; return Continue; }
+ Operation visit(Entity *) override { count++; return Continue; }
};
class EnabledVisitor : public EntityVisitor
@@ -83,7 +83,7 @@ public:
EnabledVisitor(NodeManagers *manager) : EntityVisitor(manager) { }
int count = 0;
- Operation visit(Entity *e) { count++; return e->isEnabled() ? Continue : Prune; }
+ Operation visit(Entity *e) override { count++; return e->isEnabled() ? Continue : Prune; }
};
class tst_RenderEntity : public QObject
diff --git a/tests/auto/render/qcamera/tst_qcamera.cpp b/tests/auto/render/qcamera/tst_qcamera.cpp
index 26a103c95..4e8da68cf 100644
--- a/tests/auto/render/qcamera/tst_qcamera.cpp
+++ b/tests/auto/render/qcamera/tst_qcamera.cpp
@@ -114,8 +114,8 @@ public:
~TestAspect();
- void onRegistered() { QRenderAspect::onRegistered(); }
- void onUnregistered() { QRenderAspect::onUnregistered(); }
+ void onRegistered() override { QRenderAspect::onRegistered(); }
+ void onUnregistered() override { QRenderAspect::onUnregistered(); }
Qt3DRender::Render::NodeManagers *nodeManagers() const { return d_func()->m_renderer->nodeManagers(); }
Qt3DRender::Render::FrameGraphNode *frameGraphRoot() const { return d_func()->m_renderer->frameGraphRoot(); }
diff --git a/tests/manual/paintedtexture-cpp/scene.cpp b/tests/manual/paintedtexture-cpp/scene.cpp
index e5ef6730f..5931d003c 100644
--- a/tests/manual/paintedtexture-cpp/scene.cpp
+++ b/tests/manual/paintedtexture-cpp/scene.cpp
@@ -71,7 +71,7 @@ public:
}
protected:
- void paint(QPainter *painter)
+ void paint(QPainter *painter) override
{
int w = painter->device()->width();
int h = painter->device()->height();
diff --git a/tests/manual/rendercapture-qml-fbo/rendercaptureprovider.h b/tests/manual/rendercapture-qml-fbo/rendercaptureprovider.h
index 82095e1f6..bc0f54963 100644
--- a/tests/manual/rendercapture-qml-fbo/rendercaptureprovider.h
+++ b/tests/manual/rendercapture-qml-fbo/rendercaptureprovider.h
@@ -70,7 +70,7 @@ public:
m_image = reply->image();
}
- virtual QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize)
+ virtual QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize) override
{
Q_UNUSED(id);
Q_UNUSED(requestedSize);
diff --git a/tests/manual/rendercapture-qml/rendercaptureprovider.h b/tests/manual/rendercapture-qml/rendercaptureprovider.h
index 82095e1f6..bc0f54963 100644
--- a/tests/manual/rendercapture-qml/rendercaptureprovider.h
+++ b/tests/manual/rendercapture-qml/rendercaptureprovider.h
@@ -70,7 +70,7 @@ public:
m_image = reply->image();
}
- virtual QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize)
+ virtual QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize) override
{
Q_UNUSED(id);
Q_UNUSED(requestedSize);