From f21e9ba6efa2b1c8169491db271f79b87b5b0ce4 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Tue, 7 Aug 2012 11:26:37 +1000 Subject: Remove interim compatibility measures Also update some variables in qtdeclarative which failed to update rootItem->contentItem. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d3 Reviewed-by: Alan Alpert <416365416c@gmail.com> --- examples/quick/scenegraph/openglunderqml/squircle.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'examples/quick/scenegraph/openglunderqml/squircle.cpp') diff --git a/examples/quick/scenegraph/openglunderqml/squircle.cpp b/examples/quick/scenegraph/openglunderqml/squircle.cpp index 24e8533d8e..867ce4a7e0 100644 --- a/examples/quick/scenegraph/openglunderqml/squircle.cpp +++ b/examples/quick/scenegraph/openglunderqml/squircle.cpp @@ -59,8 +59,8 @@ void Squircle::setT(qreal t) return; m_t = t; emit tChanged(); - if (canvas()) - canvas()->update(); + if (window()) + window()->update(); } //! [8] @@ -113,7 +113,7 @@ void Squircle::paint() m_program->bindAttributeLocation("vertices", 0); m_program->link(); - connect(canvas()->openglContext(), SIGNAL(aboutToBeDestroyed()), + connect(window()->openglContext(), SIGNAL(aboutToBeDestroyed()), this, SLOT(cleanup()), Qt::DirectConnection); } //! [4] //! [5] -- cgit v1.2.3