From 50f100611620f9c2b0b1e01868d0de5f7b783de2 Mon Sep 17 00:00:00 2001 From: Andy Nichols Date: Thu, 11 Sep 2014 17:22:59 +0200 Subject: Check for valid QSGRenderContext instead of QOpenGLContext A QQuickWindow with a valid QSGRenderContext is what should be checked for in QQuickCanvasItem::itemChange. Change-Id: Ibb85c2bb79d85b2d91b5d68cfa8a4760106047ae Reviewed-by: Gunnar Sletta --- src/quick/items/context2d/qquickcanvasitem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/quick/items/context2d/qquickcanvasitem.cpp') diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp index f9e7bfd0ae..345af6faf4 100644 --- a/src/quick/items/context2d/qquickcanvasitem.cpp +++ b/src/quick/items/context2d/qquickcanvasitem.cpp @@ -667,7 +667,7 @@ void QQuickCanvasItem::itemChange(QQuickItem::ItemChange change, const QQuickIte return; d->window = value.window; - if (d->window->openglContext() != 0) // available context == initialized + if (QQuickWindowPrivate::get(d->window)->context != 0) // available context == initialized sceneGraphInitialized(); else connect(d->window, SIGNAL(sceneGraphInitialized()), SLOT(sceneGraphInitialized())); -- cgit v1.2.3