From 43550edd01f3093359f2c3ac9ccbc00d7fb82817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Tue, 1 Nov 2011 08:56:47 +0100 Subject: Get rid of QOpenGLContext dependency in WaylandCompositor constructor. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now WaylandSurface::texture() takes a QOpenGLContext * instead. This prevents a crash in qml-compositor against wayland_egl, since the context was 0 (it's created behind the scenes by scene graph at a later point). Change-Id: Ia02f596922ad0edea602dfe12b411ec827d47669 Reviewed-by: Jørgen Lind --- examples/qml-compositor/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/qml-compositor') diff --git a/examples/qml-compositor/main.cpp b/examples/qml-compositor/main.cpp index 3ff3583f2..7f2d47bed 100644 --- a/examples/qml-compositor/main.cpp +++ b/examples/qml-compositor/main.cpp @@ -57,7 +57,7 @@ class QmlCompositor : public QQuickView, public WaylandCompositor { Q_OBJECT public: - QmlCompositor() : WaylandCompositor(this, const_cast(QOpenGLContext::currentContext())) { + QmlCompositor() : WaylandCompositor(this) { //setMouseTracking(true); setSource(QUrl(QLatin1String("qrc:qml/QmlCompositor/main.qml"))); setResizeMode(QQuickView::SizeRootObjectToView); -- cgit v1.2.3