summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
authorTom Cooksey <thomas.cooksey@nokia.com>2009-10-20 06:57:39 (GMT)
committerTom Cooksey <thomas.cooksey@nokia.com>2009-10-20 06:57:39 (GMT)
commit43b3307bebb9600954e48b0a3b341d5d9b2b26de (patch)
tree8c33252249c572709653c7140c3224b5f18288be /src/opengl
parent34e25637f11972c848f78757fe023a9b1360edc9 (diff)
downloadQt-43b3307bebb9600954e48b0a3b341d5d9b2b26de.zip
Qt-43b3307bebb9600954e48b0a3b341d5d9b2b26de.tar.gz
Qt-43b3307bebb9600954e48b0a3b341d5d9b2b26de.tar.bz2
Fix build on desktop X11
Hash-Define out X11GL pixmap data until the GLX implementation is ready.
Diffstat (limited to 'src/opengl')
-rw-r--r--src/opengl/qgraphicssystem_gl.cpp2
-rw-r--r--src/opengl/qpixmapdata_x11gl_p.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/opengl/qgraphicssystem_gl.cpp b/src/opengl/qgraphicssystem_gl.cpp
index 60d58a7..0ee1e82 100644
--- a/src/opengl/qgraphicssystem_gl.cpp
+++ b/src/opengl/qgraphicssystem_gl.cpp
@@ -57,7 +57,7 @@ extern QGLWidget *qt_gl_getShareWidget();
QPixmapData *QGLGraphicsSystem::createPixmapData(QPixmapData::PixelType type) const
{
-#ifdef Q_WS_X11
+#if defined(Q_WS_X11) && defined(QT_OPENGL_ES)
if (type == QPixmapData::PixmapType && QX11GLPixmapData::hasX11GLPixmaps())
return new QX11GLPixmapData();
#endif
diff --git a/src/opengl/qpixmapdata_x11gl_p.h b/src/opengl/qpixmapdata_x11gl_p.h
index 3e09ba9..bba9bb3 100644
--- a/src/opengl/qpixmapdata_x11gl_p.h
+++ b/src/opengl/qpixmapdata_x11gl_p.h
@@ -74,11 +74,9 @@ public:
QGLContext* context() const;
QSize size() const;
-
static bool hasX11GLPixmaps();
static QGLFormat glFormat();
private:
- static void createPixmapSharedContext(EGLConfig config);
mutable QGLContext* ctx;
};