From 045c79f5ed6960109f9ebf76775fa1289c5080b0 Mon Sep 17 00:00:00 2001 From: Donald Carr Date: Fri, 16 Mar 2012 00:02:46 +0000 Subject: [PATCH] Correctly export GL graphics engine for use in plugins MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 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(-) diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index eb27e86..8e471cf 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 2177c14..86645fd 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 -- 2.7.4