Correctly export GL graphics engine for use in plugins
authorDonald Carr <donald.carr@nokia.com>
Fri, 16 Mar 2012 00:02:46 +0000 (00:02 +0000)
committerQt by Nokia <qt-info@nokia.com>
Thu, 22 Mar 2012 12:30:06 +0000 (13:30 +0100)
EGLFS and QNX both reference this symbol, hence it needs to be exported

Change-Id: I11b2b8ad5f2b81d951173f7cd8a7fbb8be4bb89b
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
src/opengl/qgl.cpp
src/opengl/qgl_p.h

index eb27e86..8e471cf 100644 (file)
@@ -4665,7 +4665,7 @@ void QGLWidget::drawTexture(const QPointF &point, GLuint textureId, GLenum textu
 
 Q_GLOBAL_STATIC(QGLEngineThreadStorage<QGL2PaintEngineEx>, qt_gl_2_engine)
 
-QPaintEngine* qt_qgl_paint_engine()
+Q_OPENGL_EXPORT QPaintEngine* qt_qgl_paint_engine()
 {
     return qt_gl_2_engine()->engine();
 }
index 2177c14..86645fd 100644 (file)
@@ -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