AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correctly export GL graphics engine for use in plugins

Browse Source 
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>
This commit is contained in:
Donald Carr 2012-03-16 00:02:46 +00:00 committed by Qt by Nokia
parent f89bf2c153
commit 045c79f5ed
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/opengl/qgl.cpp
View File

@ -4665,7 +4665,7 @@ void QGLWidget::drawTexture(const QPointF &point, GLuint textureId, GLenum textu
Q_GLOBAL_STATIC(QGLEngineThreadStorage<QGL2PaintEngineEx>, qt_gl_2_engine) 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(); return qt_gl_2_engine()->engine();
} }

2
src/opengl/qgl_p.h
View File

@ -513,7 +513,7 @@ QGLTexture* QGLTextureCache::getTexture(QGLContext *ctx, qint64 key)
return m_cache.object(cacheKey); 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. // Put a guard around a GL object identifier and its context.
// When the context goes away, a shared context will be used // When the context goes away, a shared context will be used