From 033eff02fe505ec9ccc74563e69ff67fb6e2cb1b Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Fri, 13 Apr 2012 09:14:59 -0700 Subject: [PATCH] doc: QWindowSurface is dead MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It goes by the name of QBackingStore these days. Change-Id: Id46254e47ee0abf9e669862eec6c2205d9634368 Reviewed-by: Holger Freyther Reviewed-by: Samuel Rødal --- src/gui/image/qpixmap_raster.cpp | 2 +- src/gui/kernel/qplatformwindow_qpa.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/image/qpixmap_raster.cpp b/src/gui/image/qpixmap_raster.cpp index 7c7c465..27f472d 100644 --- a/src/gui/image/qpixmap_raster.cpp +++ b/src/gui/image/qpixmap_raster.cpp @@ -151,7 +151,7 @@ void QRasterPlatformPixmap::fromImageReader(QImageReader *imageReader, createPixmapForImage(image, flags, /* inplace = */true); } -// from qwindowsurface.cpp +// from qbackingstore.cpp extern void qt_scrollRectInImage(QImage &img, const QRect &rect, const QPoint &offset); void QRasterPlatformPixmap::copy(const QPlatformPixmap *data, const QRect &rect) diff --git a/src/gui/kernel/qplatformwindow_qpa.cpp b/src/gui/kernel/qplatformwindow_qpa.cpp index 973c641..d5f0277 100644 --- a/src/gui/kernel/qplatformwindow_qpa.cpp +++ b/src/gui/kernel/qplatformwindow_qpa.cpp @@ -327,7 +327,7 @@ bool QPlatformWindow::setMouseGrabEnabled(bool grab) However, it is not concerned with how Qt renders into the window it represents. Visible QWindows will always have a QPlatformWindow. However, it is not necessary for - all windows to have a QWindowSurface. This is the case for QOpenGLWidget. And could be the case for + all windows to have a QBackingStore. This is the case for QOpenGLWidget. And could be the case for windows where some 3.party renders into it. The platform specific window handle can be retrieved by the winId function. @@ -338,7 +338,7 @@ bool QPlatformWindow::setMouseGrabEnabled(bool grab) The only way to retrieve a QPlatformOpenGLContext in QPA is by calling the glContext() function on QPlatformWindow. - \sa QWindowSurface, QWindow + \sa QBackingStore, QWindow */ QT_END_NAMESPACE -- 2.7.4