diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-09-14 16:01:55 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-09-15 13:41:35 +0000 |
| commit | 06230b2fa2ccaa39559d382c8ef71a93176f31a1 (patch) | |
| tree | 57ae9ff6d7228bc9077d9627c2e2a56dac0d9d82 /src/compositor/compositor_api/qwaylandcompositor.cpp | |
| parent | 96275f64afd66161f8bb8b4b86ed3cd252826323 (diff) | |
Remove QWaylandCompositor::cleanupGraphicsResources()
it is not needed anymore since the QWaylandView holds a reference to the
buffer and the QWaylandQuickItem owns the texture
Change-Id: I0a4da028cf1cecf4b0710b96737dfc1035e5f1f9
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
Diffstat (limited to 'src/compositor/compositor_api/qwaylandcompositor.cpp')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandcompositor.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp index 03ba1e686..64abb6fba 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandcompositor.cpp @@ -195,8 +195,6 @@ void QWaylandCompositorPrivate::init() QWaylandCompositorPrivate::~QWaylandCompositorPrivate() { - if (!destroyed_surfaces.isEmpty()) - qWarning("QWaylandCompositor::cleanupGraphicsResources() must be called manually"); qDeleteAll(clients); qDeleteAll(outputSpaces); @@ -211,7 +209,7 @@ void QWaylandCompositorPrivate::destroySurface(QWaylandSurface *surface) Q_Q(QWaylandCompositor); q->surfaceAboutToBeDestroyed(surface); - destroyed_surfaces << surface; + delete surface; } void QWaylandCompositorPrivate::unregisterSurface(QWaylandSurface *surface) @@ -505,12 +503,6 @@ uint QWaylandCompositor::currentTimeMsecs() const return d->timer.elapsed(); } -void QWaylandCompositor::cleanupGraphicsResources() -{ - Q_D(QWaylandCompositor); - qDeleteAll(d->destroyed_surfaces); - d->destroyed_surfaces.clear(); -} void QWaylandCompositor::processWaylandEvents() { |