From 5234824e8f767ffd5dbaa898d7415f2ba2a900c9 Mon Sep 17 00:00:00 2001
From: Jani Uusi-Rantala <jani.uusi-rantala@nokia.com>
Date: Tue, 6 Sep 2011 16:21:56 +0300
Subject: [PATCH] Fix try #2 at QSurface missing a virtual destructor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

All virtual base classes with accessible destructor should declare
the destructor as virtual too.

Change-Id: I2b07c7e824612af072d7802095d958dca8cc34c8
Reviewed-on: http://codereview.qt.nokia.com/4274
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 src/gui/kernel/qwindow.cpp | 4 ++++
 src/gui/kernel/qwindow.h   | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index c6e479358d..9bf58e1656 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -101,6 +101,10 @@ QWindow::~QWindow()
     destroy();
 }
 
+QSurface::~QSurface()
+{
+}
+
 void QWindow::setSurfaceType(SurfaceType surfaceType)
 {
     Q_D(QWindow);
diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h
index c64ad13363..76e0efb6fb 100644
--- a/src/gui/kernel/qwindow.h
+++ b/src/gui/kernel/qwindow.h
@@ -81,6 +81,8 @@ public:
         Window
     };
 
+    virtual ~QSurface();
+
     SurfaceType surfaceType() const { return m_type; }
 
     virtual QSurfaceFormat format() const = 0;