diff options
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qoffscreensurface.cpp | 20 | ||||
| -rw-r--r-- | src/gui/kernel/qoffscreensurface.h | 3 |
2 files changed, 19 insertions, 4 deletions
diff --git a/src/gui/kernel/qoffscreensurface.cpp b/src/gui/kernel/qoffscreensurface.cpp index 307bc5e62f..4f8276aa87 100644 --- a/src/gui/kernel/qoffscreensurface.cpp +++ b/src/gui/kernel/qoffscreensurface.cpp @@ -121,14 +121,16 @@ public: /*! - Creates an offscreen surface for the \a targetScreen. + \since 5.10 + + Creates an offscreen surface for the \a targetScreen with the given \a parent. The underlying platform surface is not created until create() is called. \sa setScreen(), create() */ -QOffscreenSurface::QOffscreenSurface(QScreen *targetScreen) - : QObject(*new QOffscreenSurfacePrivate(), 0) +QOffscreenSurface::QOffscreenSurface(QScreen *targetScreen, QObject *parent) + : QObject(*new QOffscreenSurfacePrivate(), parent) , QSurface(Offscreen) { Q_D(QOffscreenSurface); @@ -143,6 +145,18 @@ QOffscreenSurface::QOffscreenSurface(QScreen *targetScreen) 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. diff --git a/src/gui/kernel/qoffscreensurface.h b/src/gui/kernel/qoffscreensurface.h index 35c498c89a..6a90ba2c9b 100644 --- a/src/gui/kernel/qoffscreensurface.h +++ b/src/gui/kernel/qoffscreensurface.h @@ -57,7 +57,8 @@ class Q_GUI_EXPORT QOffscreenSurface : public QObject, public QSurface Q_DECLARE_PRIVATE(QOffscreenSurface) public: - + // ### Qt 6: merge overloads + explicit QOffscreenSurface(QScreen *screen, QObject *parent = Q_NULLPTR); explicit QOffscreenSurface(QScreen *screen = Q_NULLPTR); virtual ~QOffscreenSurface(); |