diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2017-04-23 00:21:18 +0200 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2017-04-23 20:21:20 +0000 |
| commit | 711e94916ad4b97128849072caf977c13152c64c (patch) | |
| tree | f15ec58a0a355dfd30e0f37408751aaef57d5631 /src/gui | |
| parent | bdaa1aaf9ed3fc93363fd66b3c99512a7d86fb4a (diff) | |
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 <marc.mutz@kdab.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qoffscreensurface.h | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |