diff options
| author | Michael Dominic K <mdk@codethink.co.uk> | 2010-06-30 16:59:14 (GMT) |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2010-06-30 16:59:14 (GMT) |
| commit | 6a218a31de60ea6f3f75fb6df014ef7323a264d6 (patch) | |
| tree | 7f58b6ae85fb37fe743a3540547f66e2027efe1e | |
| parent | 01648005f1f546dc0281155fecd94b4f47a94584 (diff) | |
| download | Qt-6a218a31de60ea6f3f75fb6df014ef7323a264d6.zip Qt-6a218a31de60ea6f3f75fb6df014ef7323a264d6.tar.gz Qt-6a218a31de60ea6f3f75fb6df014ef7323a264d6.tar.bz2 | |
Export various symbols needed to make a custom GL graphicssystem.
Merge-request: 2422
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| -rw-r--r-- | src/gui/painting/qgraphicssystem_runtime_p.h | 2 | ||||
| -rw-r--r-- | src/opengl/qgl_p.h | 2 | ||||
| -rw-r--r-- | src/opengl/qglextensions_p.h | 2 | ||||
| -rw-r--r-- | src/opengl/qwindowsurface_gl_p.h | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/painting/qgraphicssystem_runtime_p.h b/src/gui/painting/qgraphicssystem_runtime_p.h index 101a8e7..7aab89c 100644 --- a/src/gui/painting/qgraphicssystem_runtime_p.h +++ b/src/gui/painting/qgraphicssystem_runtime_p.h @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE class QRuntimeGraphicsSystem; -class QRuntimePixmapData : public QPixmapData { +class Q_GUI_EXPORT QRuntimePixmapData : public QPixmapData { public: QRuntimePixmapData(const QRuntimeGraphicsSystem *gs, PixelType type); ~QRuntimePixmapData(); diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index b57972c..34a6b7c 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -415,7 +415,7 @@ public: #if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS) static QGLExtensionFuncs qt_extensionFuncs; - static QGLExtensionFuncs& extensionFuncs(const QGLContext *); + static Q_OPENGL_EXPORT QGLExtensionFuncs& extensionFuncs(const QGLContext *); #endif static void setCurrentContext(QGLContext *context); diff --git a/src/opengl/qglextensions_p.h b/src/opengl/qglextensions_p.h index 7597b33..6259cca 100644 --- a/src/opengl/qglextensions_p.h +++ b/src/opengl/qglextensions_p.h @@ -882,7 +882,7 @@ bool qt_resolve_frag_program_extensions(QGLContext *ctx); bool qt_resolve_glsl_extensions(QGLContext *ctx); #ifndef QT_NO_EGL -bool qt_resolve_eglimage_gl_extensions(QGLContext *ctx); +Q_OPENGL_EXPORT bool qt_resolve_eglimage_gl_extensions(QGLContext *ctx); #endif QT_END_NAMESPACE diff --git a/src/opengl/qwindowsurface_gl_p.h b/src/opengl/qwindowsurface_gl_p.h index 624236c..5e670fe 100644 --- a/src/opengl/qwindowsurface_gl_p.h +++ b/src/opengl/qwindowsurface_gl_p.h @@ -66,6 +66,8 @@ class QRegion; class QWidget; struct QGLWindowSurfacePrivate; +Q_OPENGL_EXPORT QGLWidget* qt_gl_share_widget(); + class QGLWindowSurfaceGLPaintDevice : public QGLPaintDevice { public: |