diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/painting/qpaintdevice.qdoc | 3 | ||||
| -rw-r--r-- | src/opengl/qopenglwindow.cpp | 8 | ||||
| -rw-r--r-- | src/widgets/doc/src/graphicsview.qdoc | 6 | ||||
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 3 | ||||
| -rw-r--r-- | src/widgets/widgets/qmainwindow.cpp | 2 |
5 files changed, 9 insertions, 13 deletions
diff --git a/src/gui/painting/qpaintdevice.qdoc b/src/gui/painting/qpaintdevice.qdoc index 0cba864523..3b93faed84 100644 --- a/src/gui/painting/qpaintdevice.qdoc +++ b/src/gui/painting/qpaintdevice.qdoc @@ -39,8 +39,7 @@ right and Y increases downwards. The unit is one pixel. The drawing capabilities of QPaintDevice are currently implemented - by the QWidget, QImage, QPixmap, QGLPixelBuffer, QPicture, and - QPrinter subclasses. + by the QWidget, QImage, QPixmap, QPicture, and QPrinter subclasses. To implement support for a new backend, you must derive from QPaintDevice and reimplement the virtual paintEngine() function to diff --git a/src/opengl/qopenglwindow.cpp b/src/opengl/qopenglwindow.cpp index f473d849cf..d000dced94 100644 --- a/src/opengl/qopenglwindow.cpp +++ b/src/opengl/qopenglwindow.cpp @@ -60,8 +60,8 @@ QT_BEGIN_NAMESPACE QOpenGLWindow is an enhanced QWindow that allows easily creating windows that perform OpenGL rendering using an API that is compatible with QOpenGLWidget - and is similar to the legacy QGLWidget. Unlike QOpenGLWidget, QOpenGLWindow - has no dependency on the widgets module and offers better performance. + Unlike QOpenGLWidget, QOpenGLWindow has no dependency on the widgets module + and offers better performance. A typical application will subclass QOpenGLWindow and reimplement the following virtual functions: @@ -100,8 +100,8 @@ QT_BEGIN_NAMESPACE QPainter-based drawing. QOpenGLWindow supports multiple update behaviors. The default, - \c NoPartialUpdate is equivalent to a regular, OpenGL-based QWindow or the - legacy QGLWidget. In contrast, \c PartialUpdateBlit and \c PartialUpdateBlend are + \c NoPartialUpdate is equivalent to a regular, OpenGL-based QWindow. In + contrast, \c PartialUpdateBlit and \c PartialUpdateBlend are more in line with QOpenGLWidget's way of working, where there is always an extra, dedicated framebuffer object present. These modes allow, by sacrificing some performance, redrawing only a smaller area on each paint and diff --git a/src/widgets/doc/src/graphicsview.qdoc b/src/widgets/doc/src/graphicsview.qdoc index 33f480b0bf..f1f848d6df 100644 --- a/src/widgets/doc/src/graphicsview.qdoc +++ b/src/widgets/doc/src/graphicsview.qdoc @@ -117,7 +117,7 @@ of a scene. You can attach several views to the same scene, to provide several viewports into the same data set. The view widget is a scroll area, and provides scroll bars for navigating through large scenes. To - enable OpenGL support, you can set a QGLWidget as the viewport by + enable OpenGL support, you can set a QOpenGLWidget as the viewport by calling QGraphicsView::setViewport(). \snippet graphicsview.cpp 1 @@ -436,10 +436,10 @@ \section2 OpenGL Rendering - To enable OpenGL rendering, you simply set a new QGLWidget as the + To enable OpenGL rendering, you simply set a new QOpenGLWidget as the viewport of QGraphicsView by calling QGraphicsView::setViewport(). If you want OpenGL with antialiasing, you need OpenGL sample buffer - support (see QGLFormat::sampleBuffers()). + support (see QSurfaceFormat::samples()). Example: diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 397fb345c2..c5379941ef 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -4913,9 +4913,6 @@ void qt_qpa_set_cursor(QWidget *w, bool force) \note To obtain the contents of a QOpenGLWidget, use QOpenGLWidget::grabFramebuffer() instead. - - \note To obtain the contents of a QGLWidget (deprecated), use - QGLWidget::grabFrameBuffer() or QGLWidget::renderPixmap() instead. */ void QWidget::render(QPaintDevice *target, const QPoint &targetOffset, const QRegion &sourceRegion, RenderFlags renderFlags) diff --git a/src/widgets/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp index 4f94b81b19..4bd3e23479 100644 --- a/src/widgets/widgets/qmainwindow.cpp +++ b/src/widgets/widgets/qmainwindow.cpp @@ -1349,7 +1349,7 @@ bool QMainWindow::event(QEvent *event) Note that the Qt 5 implementation has several limitations compared to Qt 4: \list - \li Use in windows with OpenGL content is not supported. This includes QGLWidget and QOpenGLWidget. + \li Use in windows with OpenGL content is not supported. This includes QOpenGLWidget. \li Using dockable or movable toolbars may result in painting errors and is not recommended \endlist |