1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove various traces of QGL

Browse Source 
Removed friend declarations, some check etc.

Task-number: QTBUG-74408
Change-Id: I1c5b46a564beee2c1d894678b908803f91df68aa
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
This commit is contained in:
Johan Klokkhammer Helsing 2020-02-19 11:13:16 +01:00
parent 60f12c58a0
commit eca884a483
4 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/tools/uic/qclass_lib_map.h
View File

@ -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)

4
src/widgets/effects/qpixmapfilter_p.h
View File

@ -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;

2
src/widgets/graphicsview/qgraphicsview.cpp
View File

@ -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);

3
src/widgets/kernel/qwidget.h
View File

@ -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;