diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-04-24 13:43:56 +0100 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2020-04-27 11:57:33 +0100 |
| commit | 6c1758d35e20655f46ba3696671068f4862c8878 (patch) | |
| tree | d4b4fc2ae8f5a4512de4eb015667b024b6a8e6b9 /src/plugins/renderers/opengl/renderer/renderer_p.h | |
| parent | b7967a8abcdac438a1f31800b71e219e3c52c24a (diff) | |
| parent | 37735f11f9437b916b194cfd48c452c7c70682f8 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Id669d5c1aab29965eac0dabd1cb497e908dac23e
Diffstat (limited to 'src/plugins/renderers/opengl/renderer/renderer_p.h')
| -rw-r--r-- | src/plugins/renderers/opengl/renderer/renderer_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/renderers/opengl/renderer/renderer_p.h b/src/plugins/renderers/opengl/renderer/renderer_p.h index 8cf610efb..d4980464a 100644 --- a/src/plugins/renderers/opengl/renderer/renderer_p.h +++ b/src/plugins/renderers/opengl/renderer/renderer_p.h @@ -173,7 +173,7 @@ public: ~Renderer(); void dumpInfo() const override; - API api() const override { return AbstractRenderer::OpenGL; } + API api() const override { return Qt3DRender::API::OpenGL; } qint64 time() const override; void setTime(qint64 time) override; @@ -270,7 +270,7 @@ public: QSharedPointer<RenderBackendResourceAccessor> resourceAccessor() const override; - const GraphicsApiFilterData *contextInfo() const; + const GraphicsApiFilterData *contextInfo() const override; SubmissionContext *submissionContext() const; inline RenderStateSet *defaultRenderState() const { return m_defaultRenderStateSet; } |