diff options
| -rw-r--r-- | src/opengl/qgraphicssystem_gl.cpp | 2 | ||||
| -rw-r--r-- | src/opengl/qpixmapdata_x11gl_p.h | 2 |
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; }; |