From b936b959650128bb8befaaa069477629105c680d Mon Sep 17 00:00:00 2001 From: Donald Carr Date: Wed, 7 Mar 2012 14:07:07 +0000 Subject: EGLFS: Integrate building into configure. With the move to the QPA architecture EGL is now only required by individual platform plugins and the configure script has been adjusted to reflect this. Change-Id: Ieadacef0b970f29752d9e3e36a007e5cbb005b0d Reviewed-by: Oswald Buddenhagen Reviewed-by: Girish Ramakrishnan --- src/opengl/opengl.pro | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/opengl') diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 89f8d0a3c2..b2b3790b29 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -72,6 +72,4 @@ SOURCES += qglshaderprogram.cpp \ SOURCES += qgl_qpa.cpp \ qglpixelbuffer_stub.cpp -DEFINES += QT_NO_EGL - INCLUDEPATH += ../3rdparty/harfbuzz/src -- cgit v1.2.3 From 045c79f5ed6960109f9ebf76775fa1289c5080b0 Mon Sep 17 00:00:00 2001 From: Donald Carr Date: Fri, 16 Mar 2012 00:02:46 +0000 Subject: Correctly export GL graphics engine for use in plugins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit EGLFS and QNX both reference this symbol, hence it needs to be exported Change-Id: I11b2b8ad5f2b81d951173f7cd8a7fbb8be4bb89b Reviewed-by: Girish Ramakrishnan Reviewed-by: Samuel Rødal --- src/opengl/qgl.cpp | 2 +- src/opengl/qgl_p.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/opengl') diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index eb27e865b5..8e471cfa45 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -4665,7 +4665,7 @@ void QGLWidget::drawTexture(const QPointF &point, GLuint textureId, GLenum textu Q_GLOBAL_STATIC(QGLEngineThreadStorage, qt_gl_2_engine) -QPaintEngine* qt_qgl_paint_engine() +Q_OPENGL_EXPORT QPaintEngine* qt_qgl_paint_engine() { return qt_gl_2_engine()->engine(); } diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index 2177c147d8..86645fd5c1 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -513,7 +513,7 @@ QGLTexture* QGLTextureCache::getTexture(QGLContext *ctx, qint64 key) return m_cache.object(cacheKey); } -extern QPaintEngine* qt_qgl_paint_engine(); +Q_OPENGL_EXPORT extern QPaintEngine* qt_qgl_paint_engine(); // Put a guard around a GL object identifier and its context. // When the context goes away, a shared context will be used -- cgit v1.2.3