1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make use of the new QPlatformIntegration::destroyScreen

Browse Source 
Task-number: QTBUG-41141
Change-Id: I0bd789cc1090f7e0e7615b47c33a4e4179677398
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
This commit is contained in:
Giulio Camuffo 2014-10-06 14:26:46 +03:00
parent 5715d858a0
commit 846324db5a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/platforms/wayland/qwaylanddisplay.cpp
View File

@ -168,7 +168,9 @@ QWaylandDisplay::QWaylandDisplay(QWaylandIntegration *waylandIntegration)
QWaylandDisplay::~QWaylandDisplay(void) QWaylandDisplay::~QWaylandDisplay(void)
{ {
qDeleteAll(mScreens); foreach (QWaylandScreen *screen, mScreens) {
mWaylandIntegration->destroyScreen(screen);
}
mScreens.clear(); mScreens.clear();
delete mDndSelectionHandler.take(); delete mDndSelectionHandler.take();
mEventThread->quit(); mEventThread->quit();
@ -291,8 +293,8 @@ void QWaylandDisplay::registry_global_remove(uint32_t id)
if (global.interface == QStringLiteral("wl_output")) { if (global.interface == QStringLiteral("wl_output")) {
foreach (QWaylandScreen *screen, mScreens) { foreach (QWaylandScreen *screen, mScreens) {
if (screen->outputId() == id) { if (screen->outputId() == id) {
delete screen;
mScreens.removeOne(screen); mScreens.removeOne(screen);
mWaylandIntegration->destroyScreen(screen);
break; break;
} }
} }