AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QOpenGLFramebufferObject: merge toImage overloads

Browse Source 
Address ### Qt 6 comment

Change-Id: I60b1dba72dbf2490294c84e5d1a85ae7e7181fc3
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
This commit is contained in:
Volker Hilsheimer 2020-09-09 17:36:22 +02:00
parent 8186bd628f
commit 55dda687fd
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/opengl/qopenglframebufferobject.cpp
View File

@ -1458,19 +1458,6 @@ QImage QOpenGLFramebufferObject::toImage(bool flipped) const
return toImage(flipped, 0);
}
/*!
\fn QImage QOpenGLFramebufferObject::toImage() const
\overload
Returns the contents of this framebuffer object as a QImage. This method flips
the image from OpenGL coordinates to raster coordinates.
*/
// ### Qt 6: Remove this method and make it a default argument instead.
QImage QOpenGLFramebufferObject::toImage() const
{
return toImage(true, 0);
}
/*! \overload
Returns the contents of the color attachment of index \a

3
src/opengl/qopenglframebufferobject.h
View File

@ -108,8 +108,7 @@ public:
QSize size() const;
QList<QSize> sizes() const;
QImage toImage() const;
QImage toImage(bool flipped) const;
QImage toImage(bool flipped = true) const;
QImage toImage(bool flipped, int colorAttachmentIndex) const;
Attachment attachment() const;