diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-13 12:52:20 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-13 12:52:20 +0100 |
commit | 54535dec77e0855ba8268512399ad6f87c25adce (patch) | |
tree | 00f56189168e02fcf4717e2343406cad07057604 /tests | |
parent | ecd193d7b5788fca8b478a02068060a078dc5738 (diff) | |
parent | 96b1b9e3e198e751bb96eeb279106862ca38e7d7 (diff) |
Merge remote-tracking branch 'origin/5.14.0' into 5.14
Change-Id: Ibf5f508eec94be4bae2df3ce2e1511de696dcd72
Diffstat (limited to 'tests')
-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 8d27998a0..e1ee329f4 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 {} QVector<Qt3DCore::QAspectJobPtr> preRenderingJobs() override { return QVector<Qt3DCore::QAspectJobPtr>(); } QVector<Qt3DCore::QAspectJobPtr> renderBinJobs() override { return QVector<Qt3DCore::QAspectJobPtr>(); } |