summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qoffscreensurface.h
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 /src/gui/kernel/qoffscreensurface.h
parenta5c71e4366cc048858c08ed308be694bde053da7 (diff)
Merge QOffscreenSurface constructor overloads
Address ### Qt 6 comment Change-Id: I4ca9085266f9008b769bb164e6169439adadb12f Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/gui/kernel/qoffscreensurface.h')
-rw-r--r--src/gui/kernel/qoffscreensurface.h4
1 files changed, 1 insertions, 3 deletions
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;