eglfs: delete screen on exit

Delete the screen when the integration gets deleted. The screen destructor
destroys the window surface and terminates the egl connection. Note that the
egl context is not destroyed since it is managed by QOpenGLContext.

Change-Id: Ifb91c20edb6d5db684c37fb84d5ff40436f40925
Reviewed-by: Donald Carr <donald.carr@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

src/plugins/platforms/eglfs/qeglfsintegration.cpp

@@ -57,15 +57,20 @@
 QT_BEGIN_NAMESPACE
 
 QEglFSIntegration::QEglFSIntegration()
-    : mFontDb(new QGenericUnixFontDatabase())
+    : mFontDb(new QGenericUnixFontDatabase()), mScreen(new QEglFSScreen(EGL_DEFAULT_DISPLAY))
 {
-    screenAdded(new QEglFSScreen(EGL_DEFAULT_DISPLAY));
+    screenAdded(mScreen);
 
 #ifdef QEGL_EXTRA_DEBUG
     qWarning("QEglIntegration\n");
 #endif
 }
 
+QEglFSIntegration::~QEglFSIntegration()
+{
+    delete mScreen;
+}
+
 bool QEglFSIntegration::hasCapability(QPlatformIntegration::Capability cap) const
 {
     switch (cap) {

src/plugins/platforms/eglfs/qeglfsintegration.h

@@ -55,6 +55,7 @@ class QEglFSIntegration : public QPlatformIntegration
 {
 public:
     QEglFSIntegration();
+    ~QEglFSIntegration();
 
     bool hasCapability(QPlatformIntegration::Capability cap) const;
 
@@ -70,6 +71,7 @@ public:
 
 private:
     QPlatformFontDatabase *mFontDb;
+    QPlatformScreen *mScreen;
 };
 
 QT_END_NAMESPACE

src/plugins/platforms/eglfs/qeglfsscreen.cpp

@@ -146,6 +146,14 @@ QEglFSScreen::QEglFSScreen(EGLNativeDisplayType display)
     eglSwapInterval(m_dpy, swapInterval);
 }
 
+QEglFSScreen::~QEglFSScreen()
+{
+    if (m_surface)
+        eglDestroySurface(m_dpy, m_surface);
+
+    eglTerminate(m_dpy);
+}
+
 void QEglFSScreen::createAndSetPlatformContext() const {
     const_cast<QEglFSScreen *>(this)->createAndSetPlatformContext();
 }

src/plugins/platforms/eglfs/qeglfsscreen.h

@@ -56,7 +56,7 @@ class QEglFSScreen : public QPlatformScreen //huh: FullScreenScreen ;) just to f
 {
 public:
     QEglFSScreen(EGLNativeDisplayType display);
-    ~QEglFSScreen() {}
+    ~QEglFSScreen();
 
     QRect geometry() const;
     int depth() const;