summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2020-08-26 14:51:07 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2020-08-26 18:02:50 +0200
commit70f7c484c39dd5581160a8c3fa475ee108c4920d (patch)
treeb77a64c9b5b46447ddcca94186b1bf4c823aae77
parenta5c71e4366cc048858c08ed308be694bde053da7 (diff)
Merge QOffscreenSurface constructor overloads
Address ### Qt 6 comment Change-Id: I4ca9085266f9008b769bb164e6169439adadb12f Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
-rw-r--r--src/gui/kernel/qoffscreensurface.cpp13
-rw-r--r--src/gui/kernel/qoffscreensurface.h4
2 files changed, 1 insertions, 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
@@ -148,19 +148,6 @@ QOffscreenSurface::QOffscreenSurface(QScreen *targetScreen, QObject *parent)
}
/*!
- 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.
*/
QOffscreenSurface::~QOffscreenSurface()
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;