From 9cc54422943c0fc662b7b0c9a0d10565f7f6e73b Mon Sep 17 00:00:00 2001
From: Jeremy Katz <jeremy.katz@nokia.com>
Date: Wed, 30 Jun 2010 11:09:25 +0200
Subject: check for a null new parent before trying to access its
 platformWindow

This fixes a crash seen in the arora browser when exiting
---
 src/gui/kernel/qwidget_qpa.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/kernel/qwidget_qpa.cpp b/src/gui/kernel/qwidget_qpa.cpp
index 8bb3f38..1acf398 100644
--- a/src/gui/kernel/qwidget_qpa.cpp
+++ b/src/gui/kernel/qwidget_qpa.cpp
@@ -161,7 +161,7 @@ void QWidgetPrivate::setParent_sys(QWidget *newparent, Qt::WindowFlags f)
 
     if (parent != newparent) {
         QObjectPrivate::setParent_helper(newparent); //### why does this have to be done in the _sys function???
-        if (q->platformWindow()) {
+        if (q->platformWindow() && newparent) {
             QWidget * parentWithWindow = newparent->platformWindow()? newparent : newparent->nativeParentWidget();
             if (parentWithWindow && parentWithWindow->platformWindow()) {
                 q->platformWindow()->setParent(parentWithWindow->platformWindow());
-- 
cgit v0.12