diff options
| author | Louai Al-Khanji <louai.al-khanji@digia.com> | 2014-09-19 12:39:02 +0300 |
|---|---|---|
| committer | Louai Al-Khanji <louai.al-khanji@digia.com> | 2014-10-01 10:59:51 +0200 |
| commit | 9618fb7262b1b23ef5420ee83aa3b6b697eedc3e (patch) | |
| tree | 5202084588ab2eefc876f80ada170d8d6ebab4b3 /src/plugins/platforms/eglfs/qeglfsintegration.h | |
| parent | bd09405792ba3b3552a9e31e515a406c38b8ddc1 (diff) | |
EGLFS: Fix plugin destruction
The proper init/destruction order is as follows:
QEglFsHooks::platformInit()
eglInitialize()
eglTerminate()
QEglFsHooks::platformDestroy()
Prior to this patch platformDestroy() was called before eglTerminate(),
leading to a crash on some platforms.
Additionally we need to destroy the native windows before deleting the
screen, otherwise the QEglFSWindow destructor ends up calling into the
deallocated screen.
Change-Id: Id08ccbac9bb44a778bcf1a55f73c0057e0a7b3af
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Diffstat (limited to 'src/plugins/platforms/eglfs/qeglfsintegration.h')
| -rw-r--r-- | src/plugins/platforms/eglfs/qeglfsintegration.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/eglfs/qeglfsintegration.h b/src/plugins/platforms/eglfs/qeglfsintegration.h index d612a270f2..59aabebb7a 100644 --- a/src/plugins/platforms/eglfs/qeglfsintegration.h +++ b/src/plugins/platforms/eglfs/qeglfsintegration.h @@ -44,9 +44,9 @@ class QEglFSIntegration : public QEGLPlatformIntegration { public: QEglFSIntegration(); - ~QEglFSIntegration(); void initialize() Q_DECL_OVERRIDE; + void destroy() Q_DECL_OVERRIDE; bool hasCapability(QPlatformIntegration::Capability cap) const Q_DECL_OVERRIDE; QVariant styleHint(QPlatformIntegration::StyleHint hint) const Q_DECL_OVERRIDE; |