From 9c2cb3d83eca9ac448ce7aac71285c819f7c00dd Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Sun, 9 Dec 2018 17:26:07 +0000 Subject: [PATCH] Remove x11Info() and x11PictureHandle() from QPixmap docs These functions were removed in Qt 5. Also removed old note about X11 QPixmap being invalid after QApplication is destroyed. It was redundant as that's the case with many other Qt classes. Change-Id: I9dfe2679057fbd4d7b69ca94affb673c383cf519 Reviewed-by: Christian Ehrlicher Reviewed-by: Gatis Paeglis --- src/gui/image/qpixmap.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index 4b2334ae52..918e200549 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -1356,12 +1356,6 @@ QPixmap QPixmap::transformed(const QMatrix &matrix, Qt::TransformationMode mode) The cacheKey() function returns a number that uniquely identifies the contents of the QPixmap object. - The x11Info() function returns information about the configuration - of the X display used by the screen to which the pixmap currently - belongs. The x11PictureHandle() function returns the X11 Picture - handle of the pixmap for XRender support. Note that the two latter - functions are only available on x11. - \endtable \section1 Pixmap Conversion @@ -1392,9 +1386,6 @@ QPixmap QPixmap::transformed(const QMatrix &matrix, Qt::TransformationMode mode) function returns the actual matrix used for transforming the pixmap. - \note When using the native X11 graphics system, the pixmap - becomes invalid when the QApplication instance is destroyed. - \sa QBitmap, QImage, QImageReader, QImageWriter */