From 1ff94e314835682b178eac98c3c1be983e71c4ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Tue, 16 Aug 2011 09:28:01 +0200 Subject: Get rid of unused convenience class in QtOpenGL. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Jørgen Lind --- src/opengl/qglfunctions.cpp | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/opengl/qglfunctions.cpp') 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, qt_gl_functions_resource) -#else -static void qt_gl_functions_free(void *data) -{ - delete reinterpret_cast(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) -- cgit v1.2.3