diff options
Diffstat (limited to 'src/opengl')
-rw-r--r-- | src/opengl/opengl.pro | 2 | ||||
-rw-r--r-- | src/opengl/qgl.cpp | 2 | ||||
-rw-r--r-- | src/opengl/qgl_p.h | 2 |
3 files changed, 2 insertions, 4 deletions
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 diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 2c683f7ae7..6b0c637c87 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<QGL2PaintEngineEx>, 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 |