From 70f7c484c39dd5581160a8c3fa475ee108c4920d Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Wed, 26 Aug 2020 14:51:07 +0200 Subject: Merge QOffscreenSurface constructor overloads MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Address ### Qt 6 comment Change-Id: I4ca9085266f9008b769bb164e6169439adadb12f Reviewed-by: Tor Arne Vestbø --- src/gui/kernel/qoffscreensurface.cpp | 13 ------------- src/gui/kernel/qoffscreensurface.h | 4 +--- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/gui/kernel/qoffscreensurface.cpp b/src/gui/kernel/qoffscreensurface.cpp index c74fe0b3a1..fbd5c6a079 100644 --- a/src/gui/kernel/qoffscreensurface.cpp +++ b/src/gui/kernel/qoffscreensurface.cpp @@ -147,19 +147,6 @@ QOffscreenSurface::QOffscreenSurface(QScreen *targetScreen, QObject *parent) 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 cfdcd758ec..1a3c476244 100644 --- a/src/gui/kernel/qoffscreensurface.h +++ b/src/gui/kernel/qoffscreensurface.h @@ -58,9 +58,7 @@ class Q_GUI_EXPORT QOffscreenSurface : public QObject, public QSurface Q_DECLARE_PRIVATE(QOffscreenSurface) public: - // ### Qt 6: merge overloads - explicit QOffscreenSurface(QScreen *screen, QObject *parent); - explicit QOffscreenSurface(QScreen *screen = nullptr); + explicit QOffscreenSurface(QScreen *screen = nullptr, QObject *parent = nullptr); ~QOffscreenSurface(); SurfaceType surfaceType() const override; -- cgit v1.2.3