diff options
author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-05-31 15:47:02 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-05-31 15:57:03 +0200 |
commit | d0beb0d95b63c230e965cf151a39ac6e7b779ae9 (patch) | |
tree | 4dc437b0c75684e9ea6a22277953f3ba5ca661d2 /src/plugins/platforms/wayland/gl_integration/xcomposite_egl | |
parent | 9bd270f64d2eb481130663c4035f4097857c89c3 (diff) |
Fix the egl path for xcb and wayland plugins
Reviewed-by: Samuel Rødal
Diffstat (limited to 'src/plugins/platforms/wayland/gl_integration/xcomposite_egl')
2 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp b/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp index 7cdd2b8c5e..e61ee69d37 100644 --- a/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp +++ b/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp @@ -46,6 +46,7 @@ #include "wayland-xcomposite-client-protocol.h" #include <QtCore/QDebug> +#include <QtGui/QRegion> #include "qeglconvenience.h" #include "qxlibeglintegration.h" @@ -58,7 +59,7 @@ QWaylandXCompositeEGLContext::QWaylandXCompositeEGLContext(QWaylandXCompositeEGL , mWindow(window) , mBuffer(0) , mXWindow(0) - , mConfig(q_configFromQPlatformWindowFormat(glxIntegration->eglDisplay(),window->widget()->platformWindowFormat(),true,EGL_WINDOW_BIT)) + , mConfig(q_configFromQWindowFormat(glxIntegration->eglDisplay(),window->window()->requestedWindowFormat(),true,EGL_WINDOW_BIT)) , mWaitingForSync(false) { QVector<EGLint> eglContextAttrs; @@ -98,7 +99,7 @@ void * QWaylandXCompositeEGLContext::getProcAddress(const QString &procName) return (void *)eglGetProcAddress(qPrintable(procName)); } -QPlatformWindowFormat QWaylandXCompositeEGLContext::platformWindowFormat() const +QWindowFormat QWaylandXCompositeEGLContext::windowFormat() const { return q_windowFormatFromConfig(mEglIntegration->eglDisplay(),mConfig); } diff --git a/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.h b/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.h index 9d9dd53e0b..528faf07c5 100644 --- a/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.h +++ b/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.h @@ -44,8 +44,6 @@ #include <QtGui/QPlatformGLContext> -#include <QtCore/QWaitCondition> - #include "qwaylandbuffer.h" #include "qwaylandxcompositeeglintegration.h" @@ -61,7 +59,7 @@ public: void swapBuffers(); void* getProcAddress(const QString& procName); - QPlatformWindowFormat platformWindowFormat() const; + QWindowFormat windowFormat() const; void geometryChanged(); |