summaryrefslogtreecommitdiffstats
path: root/examples/qml-compositor
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2011-11-01 08:56:47 +0100
committerJørgen Lind <jorgen.lind@nokia.com>2011-11-01 09:19:39 +0100
commit43550edd01f3093359f2c3ac9ccbc00d7fb82817 (patch)
treeba660e1b925d120e7abeba9f7792af2f519a33ae /examples/qml-compositor
parent3435ebf7167c48a599ab5e29b59a7bd9bc56436d (diff)
Get rid of QOpenGLContext dependency in WaylandCompositor constructor.
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 <jorgen.lind@nokia.com>
Diffstat (limited to 'examples/qml-compositor')
-rw-r--r--examples/qml-compositor/main.cpp2
1 files changed, 1 insertions, 1 deletions
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 *>(QOpenGLContext::currentContext())) {
+ QmlCompositor() : WaylandCompositor(this) {
//setMouseTracking(true);
setSource(QUrl(QLatin1String("qrc:qml/QmlCompositor/main.qml")));
setResizeMode(QQuickView::SizeRootObjectToView);