From dd3425594874a8014a346ee3f9d43a81bd4dbf7f Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@nokia.com>
Date: Wed, 27 Apr 2011 12:11:58 +0200
Subject: [PATCH] Fix QWindow::destroy (cherry picked from commit
 00cd7aa93f916772b22c6137293c7127fe5a33b8)

---
 src/gui/kernel/qwindow_qpa.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gui/kernel/qwindow_qpa.cpp b/src/gui/kernel/qwindow_qpa.cpp
index e011c91..02695ab 100644
--- a/src/gui/kernel/qwindow_qpa.cpp
+++ b/src/gui/kernel/qwindow_qpa.cpp
@@ -353,13 +353,13 @@ QWindowFormat QWindow::format() const
 void QWindow::destroy()
 {
     Q_D(QWindow);
-    //JA, this will be solved later....
-    //    if (QGLContext *context = extra->topextra->window->glContext()) {
-    //                context->deleteQGLContext();
-    Q_ASSERT(false);
+    if (d->glContext) {
+        d->glContext->deleteQGLContext();
+    }
     delete d->glContext;
     d->glContext = 0;
-    //    }
+    delete d->platformWindow;
+    d->platformWindow = 0;
 }
 
 QPlatformWindow *QWindow::handle() const
-- 
2.7.4