From fc3d10d37a1396bc6cc18fe4b614af1f8fad6873 Mon Sep 17 00:00:00 2001 From: Marcel Krems Date: Mon, 31 Aug 2020 03:10:53 +0200 Subject: [PATCH] Remove deprecated method QOpenGLFunctions::initializeGLFunctions() Change-Id: I0c02b22630f8c9d463f48f6402a1930b60d3f818 Reviewed-by: Laszlo Agocs --- src/gui/opengl/qopenglfunctions.cpp | 7 ------- src/gui/opengl/qopenglfunctions.h | 4 ---- 2 files changed, 11 deletions(-) diff --git a/src/gui/opengl/qopenglfunctions.cpp b/src/gui/opengl/qopenglfunctions.cpp index 7c17d3798b..d2cb4df022 100644 --- a/src/gui/opengl/qopenglfunctions.cpp +++ b/src/gui/opengl/qopenglfunctions.cpp @@ -562,13 +562,6 @@ bool QOpenGLExtensions::hasOpenGLExtension(QOpenGLExtensions::OpenGLExtension ex return (d->m_extensions & int(extension)) != 0; } -/*! - \fn void QOpenGLFunctions::initializeGLFunctions() - \obsolete - - Use initializeOpenGLFunctions() instead. -*/ - /*! Initializes OpenGL function resolution for the current context. diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h index 66bdac5ca5..76552cdd0e 100644 --- a/src/gui/opengl/qopenglfunctions.h +++ b/src/gui/opengl/qopenglfunctions.h @@ -269,10 +269,6 @@ public: void initializeOpenGLFunctions(); -#if QT_DEPRECATED_SINCE(5, 0) - QT_DEPRECATED void initializeGLFunctions() { initializeOpenGLFunctions(); } -#endif - // GLES2 + OpenGL1 common subset void glBindTexture(GLenum target, GLuint texture); void glBlendFunc(GLenum sfactor, GLenum dfactor);