5 files changed, 4 insertions, 39 deletions
diff --git a/src/gui/opengl/qopengl.cpp b/src/gui/opengl/qopengl.cpp
index 3a476978e7..e961c42a25 100644
--- a/src/gui/opengl/qopengl.cpp
+++ b/src/gui/opengl/qopengl.cpp
@@ -54,8 +54,6 @@
 #include <QtCore/QFile>
 #include <QtCore/QDir>
 
-#include <set>
-
 QT_BEGIN_NAMESPACE
 
 #if defined(QT_OPENGL_3)
@@ -527,13 +525,4 @@ QOpenGLConfig::Gpu QOpenGLConfig::Gpu::fromContext()
     return gpu;
 }
 
-Q_GUI_EXPORT std::set<QByteArray> *qgpu_features(const QString &filename)
-{
-    const QSet<QString> features = QOpenGLConfig::gpuFeatures(QOpenGLConfig::Gpu::fromContext(), filename);
-    std::set<QByteArray> *result = new std::set<QByteArray>;
-    for (const QString &feature : features)
-        result->insert(feature.toUtf8());
-    return result;
-}
-
 QT_END_NAMESPACE
diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h
index 00287b0665..4554291bbd 100644
--- a/src/gui/opengl/qopenglfunctions.h
+++ b/src/gui/opengl/qopenglfunctions.h
@@ -228,26 +228,8 @@ struct QOpenGLFunctionsPrivate;
 #undef glTexLevelParameteriv
 
 #if defined(Q_CLANG_QDOC)
-#undef GLint
-typedef int GLint;
-#undef GLsizei
-typedef int GLsizei;
-#undef GLuint
-typedef unsigned int GLuint;
-#undef GLubyte
-typedef unsigned int GLubyte;
-#undef GLenum
-typedef unsigned int GLenum;
 #undef GLbitfield
 typedef unsigned int GLbitfield;
-#undef GLfloat
-typedef float GLfloat;
-#undef GLclampf
-typedef float GLclampf;
-#undef GLboolean
-typedef bool GLboolean;
-#undef GLvoid
-typedef void GLvoid;
 #undef GLchar
 typedef char GLchar;
 #endif
diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h
index 300002a9c1..54118f2926 100644
--- a/src/gui/opengl/qopenglpaintdevice.h
+++ b/src/gui/opengl/qopenglpaintdevice.h
@@ -59,7 +59,7 @@ public:
     QOpenGLPaintDevice();
     explicit QOpenGLPaintDevice(const QSize &size);
     QOpenGLPaintDevice(int width, int height);
-    virtual ~QOpenGLPaintDevice();
+    ~QOpenGLPaintDevice();
 
     int devType() const override { return QInternal::OpenGL; }
     QPaintEngine *paintEngine() const override;
diff --git a/src/gui/opengl/qopenglshaderprogram.h b/src/gui/opengl/qopenglshaderprogram.h
index 84eb8d6956..c79101fd4d 100644
--- a/src/gui/opengl/qopenglshaderprogram.h
+++ b/src/gui/opengl/qopenglshaderprogram.h
@@ -50,13 +50,6 @@
 #include <QtGui/qvector4d.h>
 #include <QtGui/qmatrix4x4.h>
 
-#if defined(Q_CLANG_QDOC)
-#undef GLint
-typedef int GLint;
-#undef GLfloat
-typedef double GLfloat;
-#endif
-
 QT_BEGIN_NAMESPACE
 
 
@@ -80,7 +73,7 @@ public:
     Q_DECLARE_FLAGS(ShaderType, ShaderTypeBit)
 
     explicit QOpenGLShader(QOpenGLShader::ShaderType type, QObject *parent = nullptr);
-    virtual ~QOpenGLShader();
+    ~QOpenGLShader();
 
     QOpenGLShader::ShaderType shaderType() const;
 
@@ -115,7 +108,7 @@ class Q_GUI_EXPORT QOpenGLShaderProgram : public QObject
     Q_OBJECT
 public:
     explicit QOpenGLShaderProgram(QObject *parent = nullptr);
-    virtual ~QOpenGLShaderProgram();
+    ~QOpenGLShaderProgram();
 
     bool addShader(QOpenGLShader *shader);
     void removeShader(QOpenGLShader *shader);
diff --git a/src/gui/opengl/qopenglversionfunctions.h b/src/gui/opengl/qopenglversionfunctions.h
index 3af1ed0466..f828e5668b 100644
--- a/src/gui/opengl/qopenglversionfunctions.h
+++ b/src/gui/opengl/qopenglversionfunctions.h
@@ -214,6 +214,7 @@ public:
 
     virtual bool initializeOpenGLFunctions();
 
+    Q_DISABLE_COPY(QAbstractOpenGLFunctions)
     Q_DECLARE_PRIVATE(QAbstractOpenGLFunctions)
 
 protected: