diff options
| author | Michael Dominic K <mdk@codethink.co.uk> | 2010-06-25 14:22:52 (GMT) |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2010-06-25 14:22:52 (GMT) |
| commit | c5aa53243bca8261d55d81cfeb525739a68b7703 (patch) | |
| tree | 4232fff3645dd192324c1f5b7615d0ea33cf7660 | |
| parent | 535adbb4954caff9d88dc57bdb57bd09b872ddf1 (diff) | |
| download | Qt-c5aa53243bca8261d55d81cfeb525739a68b7703.zip Qt-c5aa53243bca8261d55d81cfeb525739a68b7703.tar.gz Qt-c5aa53243bca8261d55d81cfeb525739a68b7703.tar.bz2 | |
Need to access extensionFuncs in subclasses too.
Merge-request: 2422
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| -rw-r--r-- | src/opengl/qgl.cpp | 7 | ||||
| -rw-r--r-- | src/opengl/qgl_p.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index b4c85ac..71db7a8 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -2220,6 +2220,13 @@ static void convertToGLFormatHelper(QImage &dst, const QImage &img, GLenum textu } } +#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS) +QGLExtensionFuncs& QGLContextPrivate::extensionFuncs(const QGLContext *) +{ + return qt_extensionFuncs; +} +#endif + QImage QGLContextPrivate::convertToGLFormat(const QImage &image, bool force_premul, GLenum texture_format) { diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index 1727a41..c7fd111 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 inline QGLExtensionFuncs& extensionFuncs(const QGLContext *) { return qt_extensionFuncs; } + static QGLExtensionFuncs& extensionFuncs(const QGLContext *); #endif static void setCurrentContext(QGLContext *context); |