From 79da236e76752c1f940036dffffebb8d2a707d66 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Thu, 6 Feb 2020 10:14:24 +0100 Subject: QOpenGLContext: Remove QGL helpers They were all private, and used only by QGL* (which have been removed) so should be safe to remove. Task-number: QTBUG-74408 Change-Id: Ia7fdff8f0bb963449470dbd8296cbdd8652c50e2 Reviewed-by: Laszlo Agocs --- src/gui/kernel/qopenglcontext.cpp | 39 --------------------------------------- 1 file changed, 39 deletions(-) (limited to 'src/gui/kernel/qopenglcontext.cpp') diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp index 6915433aed..ae5a98e832 100644 --- a/src/gui/kernel/qopenglcontext.cpp +++ b/src/gui/kernel/qopenglcontext.cpp @@ -623,7 +623,6 @@ bool QOpenGLContext::create() */ void QOpenGLContext::destroy() { - deleteQGLContext(); Q_D(QOpenGLContext); if (d->platformGLContext) emit aboutToBeDestroyed(); @@ -1176,44 +1175,6 @@ QScreen *QOpenGLContext::screen() const return d->screen; } -/*! - internal: Needs to have a pointer to qGLContext. But since this is in Qt GUI we can't - have any type information. - - \internal -*/ -void *QOpenGLContext::qGLContextHandle() const -{ - Q_D(const QOpenGLContext); - return d->qGLContextHandle; -} - -/*! - internal: If the delete function is specified QOpenGLContext "owns" - the passed context handle and will use the delete function to destroy it. - - \internal -*/ -void QOpenGLContext::setQGLContextHandle(void *handle,void (*qGLContextDeleteFunction)(void *)) -{ - Q_D(QOpenGLContext); - d->qGLContextHandle = handle; - d->qGLContextDeleteFunction = qGLContextDeleteFunction; -} - -/*! - \internal -*/ -void QOpenGLContext::deleteQGLContext() -{ - Q_D(QOpenGLContext); - if (d->qGLContextDeleteFunction && d->qGLContextHandle) { - d->qGLContextDeleteFunction(d->qGLContextHandle); - d->qGLContextDeleteFunction = nullptr; - d->qGLContextHandle = nullptr; - } -} - /*! Returns the platform-specific handle for the OpenGL implementation that is currently in use. (for example, a HMODULE on Windows) -- cgit v1.2.3