summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2013-10-30 16:27:22 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-01 17:27:50 +0100
commit52f8a98f87b39f0b77a680c9bb92e4affd622aca (patch)
tree2549fe38e9e3bdc65d5d2c60d91573882fda1c62
parentb8e0860da9a4b3949d0801a9491781a56cead438 (diff)
Fix the build with the latest qtdeclarative/stable.
Change-Id: I8764ff93fa94ef281ccd6fd6b7e7841aaedf05e8 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
-rw-r--r--lib/render_widget_host_view_qt_delegate.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/render_widget_host_view_qt_delegate.cpp b/lib/render_widget_host_view_qt_delegate.cpp
index 0c8a5f7ae..8916193cf 100644
--- a/lib/render_widget_host_view_qt_delegate.cpp
+++ b/lib/render_widget_host_view_qt_delegate.cpp
@@ -65,7 +65,7 @@
class RenderPassTexture : public QSGTexture
{
public:
- RenderPassTexture(const cc::RenderPass::Id &id, QSGContext *context);
+ RenderPassTexture(const cc::RenderPass::Id &id, QSGRenderContext *context);
const cc::RenderPass::Id &id() const { return m_id; }
void bind();
@@ -92,10 +92,10 @@ private:
QScopedPointer<QSGRenderer> m_renderer;
QScopedPointer<QOpenGLFramebufferObject> m_fbo;
- QSGContext *m_context;
+ QSGRenderContext *m_context;
};
-RenderPassTexture::RenderPassTexture(const cc::RenderPass::Id &id, QSGContext *context)
+RenderPassTexture::RenderPassTexture(const cc::RenderPass::Id &id, QSGRenderContext *context)
: QSGTexture()
, m_id(id)
, m_device_pixel_ratio(1)
@@ -329,8 +329,8 @@ QSGNode *RenderWidgetHostViewQtDelegate::updatePaintNode(QSGNode *oldNode, QQuic
if (pass != rootRenderPass) {
QSharedPointer<RenderPassTexture> rpTexture = findRenderPassTexture(pass->id, oldRenderPassTextures);
if (!rpTexture) {
- QSGContext *sgContext = QQuickWindowPrivate::get(window)->context;
- rpTexture = QSharedPointer<RenderPassTexture>(new RenderPassTexture(pass->id, sgContext));
+ QSGRenderContext *sgrc = QQuickWindowPrivate::get(window)->context;
+ rpTexture = QSharedPointer<RenderPassTexture>(new RenderPassTexture(pass->id, sgrc));
}
frameNode->renderPassTextures.append(rpTexture);
rpTexture->setDevicePixelRatio(window->devicePixelRatio());