diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-14 03:05:15 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-14 03:05:15 +0100 |
| commit | e77c85a20080e183e8ed9efd0080aee8f03a75d4 (patch) | |
| tree | 0135af5b9e920bab248bd30e8a7c9c3d0bc40b68 /tests/auto/render/commons | |
| parent | 22eccf3a95279b85c849c6a49a0a804beb58e2c5 (diff) | |
| parent | 12ae9f1892edfe5927b5b38f3d12de14b027889a (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I5a5b1d497430afdd0fe11933832a2477a7efbe30
Diffstat (limited to 'tests/auto/render/commons')
| -rw-r--r-- | tests/auto/render/commons/testrenderer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/render/commons/testrenderer.h b/tests/auto/render/commons/testrenderer.h index 8cab7edfc..05ef4c130 100644 --- a/tests/auto/render/commons/testrenderer.h +++ b/tests/auto/render/commons/testrenderer.h @@ -55,7 +55,7 @@ public: void doRender(bool swapBuffers) override { Q_UNUSED(swapBuffers) } void cleanGraphicsResources() override {} bool isRunning() const override { return true; } - bool shouldRender() override { return true; } + bool shouldRender() const override { return true; } void skipNextFrame() override {} void jobsDone(Qt3DCore::QAspectManager *manager) override { Q_UNUSED(manager) } QVector<Qt3DCore::QAspectJobPtr> preRenderingJobs() override { return QVector<Qt3DCore::QAspectJobPtr>(); } |