diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-16 09:28:01 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-08-16 13:53:13 +0200 |
| commit | 1ff94e314835682b178eac98c3c1be983e71c4ca (patch) | |
| tree | 93e9547b5cc44484ec1411994013e649f8f683a1 /src/opengl/qglfunctions.cpp | |
| parent | 30774e9552591746a2640ba39c7afdc052952597 (diff) | |
Get rid of unused convenience class in QtOpenGL.
QGLContextResource is no longer used, QGLContextGroupResource should be
preferable in all situations.
Change-Id: I7c7b90686959ced9fa34e278ef5747a7c49a5b03
Reviewed-on: http://codereview.qt.nokia.com/3005
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Diffstat (limited to 'src/opengl/qglfunctions.cpp')
| -rw-r--r-- | src/opengl/qglfunctions.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/opengl/qglfunctions.cpp b/src/opengl/qglfunctions.cpp index 02e7091c9e..48549fb8d2 100644 --- a/src/opengl/qglfunctions.cpp +++ b/src/opengl/qglfunctions.cpp @@ -148,16 +148,8 @@ struct QGLFunctionsPrivateEx : public QGLFunctionsPrivate int m_features; }; -#if QT_VERSION >= 0x040800 Q_GLOBAL_STATIC(QGLContextGroupResource<QGLFunctionsPrivateEx>, qt_gl_functions_resource) -#else -static void qt_gl_functions_free(void *data) -{ - delete reinterpret_cast<QGLFunctionsPrivateEx *>(data); -} -Q_GLOBAL_STATIC_WITH_ARGS(QGLContextResource, qt_gl_functions_resource, (qt_gl_functions_free)) -#endif static QGLFunctionsPrivateEx *qt_gl_functions(const QGLContext *context = 0) { if (!context) |