From 6bdaf5fffcd6e6b8bcd81310c30bbc6f122d7440 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=B8rgen=20Lind?= Date: Thu, 24 Mar 2011 15:25:15 +0100 Subject: [PATCH] Lighthouse: Move glx common code into shared files --- .../wayland/gl_integration/xpixmap_glx/qwaylandxpixmapglxcontext.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/platforms/wayland/gl_integration/xpixmap_glx/qwaylandxpixmapglxcontext.cpp b/src/plugins/platforms/wayland/gl_integration/xpixmap_glx/qwaylandxpixmapglxcontext.cpp index 50bf4ee..d5806bb 100644 --- a/src/plugins/platforms/wayland/gl_integration/xpixmap_glx/qwaylandxpixmapglxcontext.cpp +++ b/src/plugins/platforms/wayland/gl_integration/xpixmap_glx/qwaylandxpixmapglxcontext.cpp @@ -33,7 +33,7 @@ QWaylandXPixmapGLXContext::QWaylandXPixmapGLXContext(QWaylandXPixmapGLXIntegrati , mWindow(window) , mBuffer(0) , mPixmap(0) - , mConfig(findConfig(glxIntegration->xDisplay(),glxIntegration->screen(),window->widget()->platformWindowFormat())) + , mConfig(qglx_findConfig(glxIntegration->xDisplay(),glxIntegration->screen(),window->widget()->platformWindowFormat())) , mGlxPixmap(0) { XVisualInfo *visualInfo = glXGetVisualFromFBConfig(glxIntegration->xDisplay(),mConfig); @@ -92,7 +92,7 @@ void * QWaylandXPixmapGLXContext::getProcAddress(const QString &procName) QPlatformWindowFormat QWaylandXPixmapGLXContext::platformWindowFormat() const { - return platformWindowFromGLXFBConfig(mGlxIntegration->xDisplay(),mConfig,mContext); + return qglx_platformWindowFromGLXFBConfig(mGlxIntegration->xDisplay(),mConfig,mContext); } void QWaylandXPixmapGLXContext::geometryChanged() -- 2.7.4