diff options
author | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-06-16 18:07:49 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-06-16 18:07:49 +0200 |
commit | 29bdd01155270a55baa48c747aa5c87517099f10 (patch) | |
tree | 70a062d59981c51c4046bfe135371a5d69917ba6 /examples | |
parent | c85ea71f363e80615fb72f6c08206a935fa4bcd6 (diff) |
Make the qwidget example compositor compile with qtbase refactor.
Diffstat (limited to 'examples')
-rw-r--r-- | examples/qwidget-compositor/main.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/examples/qwidget-compositor/main.cpp b/examples/qwidget-compositor/main.cpp index 0f825c5e0..eb32aba92 100644 --- a/examples/qwidget-compositor/main.cpp +++ b/examples/qwidget-compositor/main.cpp @@ -71,8 +71,8 @@ public: //so that clients can successfully initialize egl winId(); #ifdef QT_COMPOSITOR_WAYLAND_GL - if (platformWindow()) { - platformWindow()->glContext(); + if (windowHandle()) { + windowHandle()->glSurface(); } #endif } @@ -133,12 +133,7 @@ protected: for (int i = 0; i < m_surfaces.size(); ++i) { if (m_surfaces.at(i)->type() == WaylandSurface::Texture) { #ifdef QT_COMPOSITOR_WAYLAND_GL - QPlatformGLContext *glcontext = platformWindow()->glContext(); - if (glcontext) { - QGLContext *context = QGLContext::fromPlatformGLContext(glcontext); - context->makeCurrent(); - context->drawTexture(m_surfaces.at(i)->geometry(),m_surfaces.at(i)->texture()); - } + drawTexture(m_surfaces.at(i)->geometry(), m_surfaces.at(i)->texture()); break; #endif //QT_COMPOSITOR_WAYLAND_GL } else if (m_surfaces.at(i)->type() == WaylandSurface::Shm) { |