diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-07-01 09:59:28 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-07-01 09:59:28 +0000 |
| commit | 0698f876ca02b85c1e584b72cac3444796f6a355 (patch) | |
| tree | 022748fb34278fb455d8e029d912dfb0b545f443 /src/plugins/platforms/eglfs/qeglfsintegration.cpp | |
| parent | cd297f99a2ce9c53c3ac4633bdf2425af364a1bc (diff) | |
| parent | 0aa2d318b1524cdab42ab9988270779ddcc1922a (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/platforms/eglfs/qeglfsintegration.cpp')
| -rw-r--r-- | src/plugins/platforms/eglfs/qeglfsintegration.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/platforms/eglfs/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/qeglfsintegration.cpp index d1688df8f5..5eb8485dc7 100644 --- a/src/plugins/platforms/eglfs/qeglfsintegration.cpp +++ b/src/plugins/platforms/eglfs/qeglfsintegration.cpp @@ -106,8 +106,11 @@ void QEglFSIntegration::initialize() void QEglFSIntegration::destroy() { + foreach (QWindow *w, qGuiApp->topLevelWindows()) + w->destroy(); qt_egl_device_integration()->screenDestroy(); - QEGLPlatformIntegration::destroy(); + if (display() != EGL_NO_DISPLAY) + eglTerminate(display()); qt_egl_device_integration()->platformDestroy(); } |