diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 20:14:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 20:14:23 +0200 |
| commit | 85956a9149c578d7a750fad0dc66e89eaa337ef5 (patch) | |
| tree | 1e174c75f6010503ce081760814e8659ec4415b6 /src/client/qwaylanddisplay.cpp | |
| parent | 2d9cd132061562902a9b347b87fd3ba20f434532 (diff) | |
| parent | 05ea6b992f32443df27e38bdc8b21cf970755b57 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
.qmake.conf
Change-Id: Ic75157b11eee188608c3ac7ed6fb1a033bb72750
Diffstat (limited to 'src/client/qwaylanddisplay.cpp')
| -rw-r--r-- | src/client/qwaylanddisplay.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp index bda85c49c..5b6f2cbf6 100644 --- a/src/client/qwaylanddisplay.cpp +++ b/src/client/qwaylanddisplay.cpp @@ -163,6 +163,9 @@ QWaylandDisplay::QWaylandDisplay(QWaylandIntegration *waylandIntegration) QWaylandDisplay::~QWaylandDisplay(void) { + qDeleteAll(mInputDevices); + mInputDevices.clear(); + foreach (QWaylandScreen *screen, mScreens) { mWaylandIntegration->destroyScreen(screen); } |