From 711e94916ad4b97128849072caf977c13152c64c Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Sun, 23 Apr 2017 00:21:18 +0200 Subject: QOffscreenSurface: fix blunder 7be9653f1288d32bc732262b01ba910f6a321ecd added a new constructor taking the parent QObject. However, it broke code building an object and passing 1 parameter to the constructor (the call is now ambiguous). Disambiguate. Task-number: QTBUG-60342 Change-Id: I3a36f01ebb52c7aaa4c4cdf5e2c5f37c1255bc8a Reviewed-by: Marc Mutz --- src/gui/kernel/qoffscreensurface.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gui/kernel/qoffscreensurface.h') diff --git a/src/gui/kernel/qoffscreensurface.h b/src/gui/kernel/qoffscreensurface.h index 6a90ba2c9b..3295ae0d40 100644 --- a/src/gui/kernel/qoffscreensurface.h +++ b/src/gui/kernel/qoffscreensurface.h @@ -58,7 +58,7 @@ class Q_GUI_EXPORT QOffscreenSurface : public QObject, public QSurface public: // ### Qt 6: merge overloads - explicit QOffscreenSurface(QScreen *screen, QObject *parent = Q_NULLPTR); + explicit QOffscreenSurface(QScreen *screen, QObject *parent); explicit QOffscreenSurface(QScreen *screen = Q_NULLPTR); virtual ~QOffscreenSurface(); -- cgit v1.2.3