Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: Ia0f7f0f1511f9f593c6d4585c859d1bf1353540d

1 files changed, 0 insertions, 39 deletions

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();
@@ -1177,44 +1176,6 @@ QScreen *QOpenGLContext::screen() const
 }
 
 /*!
-    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)