From eca884a48393a1687aac1063ff51b87015bfd2fc Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Wed, 19 Feb 2020 11:13:16 +0100 Subject: Remove various traces of QGL Removed friend declarations, some check etc. Task-number: QTBUG-74408 Change-Id: I1c5b46a564beee2c1d894678b908803f91df68aa Reviewed-by: Eirik Aavitsland --- src/tools/uic/qclass_lib_map.h | 15 --------------- src/widgets/effects/qpixmapfilter_p.h | 4 ---- src/widgets/graphicsview/qgraphicsview.cpp | 2 +- src/widgets/kernel/qwidget.h | 3 --- 4 files changed, 1 insertion(+), 23 deletions(-) diff --git a/src/tools/uic/qclass_lib_map.h b/src/tools/uic/qclass_lib_map.h index 3187d28396..5793b3ad13 100644 --- a/src/tools/uic/qclass_lib_map.h +++ b/src/tools/uic/qclass_lib_map.h @@ -312,21 +312,6 @@ QT_CLASS_LIB(QMacGLCompatTypes, QtOpenGL, qgl.h) QT_CLASS_LIB(QMacCompatGLint, QtOpenGL, qgl.h) QT_CLASS_LIB(QMacCompatGLuint, QtOpenGL, qgl.h) QT_CLASS_LIB(QMacCompatGLenum, QtOpenGL, qgl.h) -QT_CLASS_LIB(QGLFormat, QtOpenGL, qgl.h) -QT_CLASS_LIB(QGLContext, QtOpenGL, qgl.h) -QT_CLASS_LIB(QGLWidget, QtOpenGL, qgl.h) -QT_CLASS_LIB(QOpenGLWidget,QtWidgets,qopenglwidget.h) -QT_CLASS_LIB(QGLBuffer, QtOpenGL, qglbuffer.h) -QT_CLASS_LIB(QGLColormap, QtOpenGL, qglcolormap.h) -QT_CLASS_LIB(QGLFramebufferObject, QtOpenGL, qglframebufferobject.h) -QT_CLASS_LIB(QGLFramebufferObjectFormat, QtOpenGL, qglframebufferobject.h) -QT_CLASS_LIB(QGLFunctions, QtOpenGL, qglfunctions.h) -QT_CLASS_LIB(QGLFunctionsPrivate, QtOpenGL, qglfunctions.h) -QT_CLASS_LIB(QGLPixelBuffer, QtOpenGL, qglpixelbuffer.h) -QT_CLASS_LIB(QGLScreenSurfaceFunctions, QtOpenGL, qglscreen_qws.h) -QT_CLASS_LIB(QGLScreen, QtOpenGL, qglscreen_qws.h) -QT_CLASS_LIB(QGLShader, QtOpenGL, qglshaderprogram.h) -QT_CLASS_LIB(QGLShaderProgram, QtOpenGL, qglshaderprogram.h) QT_CLASS_LIB(QDomImplementation, QtXml, qdom.h) QT_CLASS_LIB(QDomNode, QtXml, qdom.h) QT_CLASS_LIB(QDomNodeList, QtXml, qdom.h) diff --git a/src/widgets/effects/qpixmapfilter_p.h b/src/widgets/effects/qpixmapfilter_p.h index c56acb8a24..2a6e7f5db0 100644 --- a/src/widgets/effects/qpixmapfilter_p.h +++ b/src/widgets/effects/qpixmapfilter_p.h @@ -109,7 +109,6 @@ public: void draw(QPainter *painter, const QPointF &dest, const QPixmap &src, const QRectF &srcRect = QRectF()) const override; private: - friend class QGLPixmapConvolutionFilter; friend class QVGPixmapConvolutionFilter; const qreal *convolutionKernel() const; int rows() const; @@ -135,9 +134,6 @@ public: QRectF boundingRectFor(const QRectF &rect) const override; void draw(QPainter *painter, const QPointF &dest, const QPixmap &src, const QRectF &srcRect = QRectF()) const override; - -private: - friend class QGLPixmapBlurFilter; }; class QPixmapColorizeFilterPrivate; diff --git a/src/widgets/graphicsview/qgraphicsview.cpp b/src/widgets/graphicsview/qgraphicsview.cpp index f806ecebad..a744847f33 100644 --- a/src/widgets/graphicsview/qgraphicsview.cpp +++ b/src/widgets/graphicsview/qgraphicsview.cpp @@ -2736,7 +2736,7 @@ void QGraphicsView::setupViewport(QWidget *widget) return; } - const bool isGLWidget = widget->inherits("QGLWidget") || widget->inherits("QOpenGLWidget"); + const bool isGLWidget = widget->inherits("QOpenGLWidget"); d->accelerateScrolling = !(isGLWidget); diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h index 5117fa94c8..9ea4301428 100644 --- a/src/widgets/kernel/qwidget.h +++ b/src/widgets/kernel/qwidget.h @@ -715,9 +715,6 @@ private: friend class QLayout; friend class QWidgetItem; friend class QWidgetItemV2; - friend class QGLContext; - friend class QGLWidget; - friend class QGLWindowSurface; friend class QX11PaintEngine; friend class QWin32PaintEngine; friend class QShortcutPrivate; -- cgit v1.2.3