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

Merge QOffscreenSurface constructor overloads

Browse Source 
Address ### Qt 6 comment

Change-Id: I4ca9085266f9008b769bb164e6169439adadb12f
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Volker Hilsheimer 2020-08-26 14:51:07 +02:00
parent a5c71e4366
commit 70f7c484c3
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/kernel/qoffscreensurface.cpp
View File

@ -147,19 +147,6 @@ QOffscreenSurface::QOffscreenSurface(QScreen *targetScreen, QObject *parent)
connect(d->screen, SIGNAL(destroyed(QObject*)), this, SLOT(screenDestroyed(QObject*))); connect(d->screen, SIGNAL(destroyed(QObject*)), this, SLOT(screenDestroyed(QObject*)));
} }
/*!
Creates an offscreen surface for the \a targetScreen.
The underlying platform surface is not created until create() is called.
\sa setScreen(), create()
*/
QOffscreenSurface::QOffscreenSurface(QScreen *targetScreen)
: QOffscreenSurface(targetScreen, nullptr)
{
}
/*! /*!
Destroys the offscreen surface. Destroys the offscreen surface.
*/ */

4
src/gui/kernel/qoffscreensurface.h
View File

@ -58,9 +58,7 @@ class Q_GUI_EXPORT QOffscreenSurface : public QObject, public QSurface
Q_DECLARE_PRIVATE(QOffscreenSurface) Q_DECLARE_PRIVATE(QOffscreenSurface)
public: public:
// ### Qt 6: merge overloads explicit QOffscreenSurface(QScreen *screen = nullptr, QObject *parent = nullptr);
explicit QOffscreenSurface(QScreen *screen, QObject *parent);
explicit QOffscreenSurface(QScreen *screen = nullptr);
~QOffscreenSurface(); ~QOffscreenSurface();
SurfaceType surfaceType() const override; SurfaceType surfaceType() const override;