diff options
| author | Olivier Blin <olivier.blin@softathome.com> | 2014-12-10 19:28:13 +0100 |
|---|---|---|
| committer | Olivier Blin <qt@blino.org> | 2015-03-27 15:18:15 +0000 |
| commit | 6ac99af0fa3cdf334b59dd3f85803872e7a4194f (patch) | |
| tree | 3545db7dd67c0cd8613a00ee780527026370f64b | |
| parent | d7ade0913c599aac5a46957c7f64770f637599e9 (diff) | |
Fix connecting to surfaceDestroyed
It was being called with a garbage pointer, since the signal does not
have an object argument anymore.
This has been changed in commit fc439e40e37f9c0b3108225f951fb19bb3abee80
Rework the way buffers are used and rendered
Change-Id: I220c52285909dc93aebd128fc418df3c8a6bd37c
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
| -rw-r--r-- | examples/wayland/qml-compositor/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/wayland/qml-compositor/main.cpp b/examples/wayland/qml-compositor/main.cpp index 26e730d43..9dcb95b09 100644 --- a/examples/wayland/qml-compositor/main.cpp +++ b/examples/wayland/qml-compositor/main.cpp @@ -112,8 +112,8 @@ private slots: emit windowDestroyed(QVariant::fromValue(surface)); } - void surfaceDestroyed(QObject *object) { - QWaylandQuickSurface *surface = static_cast<QWaylandQuickSurface *>(object); + void surfaceDestroyed() { + QWaylandQuickSurface *surface = static_cast<QWaylandQuickSurface *>(sender()); if (surface == m_fullscreenSurface) m_fullscreenSurface = 0; emit windowDestroyed(QVariant::fromValue(surface)); @@ -134,7 +134,7 @@ protected: } void surfaceCreated(QWaylandSurface *surface) { - connect(surface, SIGNAL(destroyed(QObject *)), this, SLOT(surfaceDestroyed(QObject *))); + connect(surface, SIGNAL(surfaceDestroyed()), this, SLOT(surfaceDestroyed())); connect(surface, SIGNAL(mapped()), this, SLOT(surfaceMapped())); connect(surface,SIGNAL(unmapped()), this,SLOT(surfaceUnmapped())); } |