From 7d9fcaccb1e6e056336b9ad1f7f89afac4699aee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Fri, 3 Jun 2011 10:07:01 +0200
Subject: Prevent crash in tst_QWidget::persistentWinId().

Only call createWinId() if we have a parent widget set.
---
 src/widgets/kernel/qwidget_qpa.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/widgets/kernel/qwidget_qpa.cpp')

diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp
index ccfec7c0a1..b8a7cb5463 100644
--- a/src/widgets/kernel/qwidget_qpa.cpp
+++ b/src/widgets/kernel/qwidget_qpa.cpp
@@ -234,7 +234,7 @@ void QWidgetPrivate::setParent_sys(QWidget *newparent, Qt::WindowFlags f)
     if (!(f&Qt::Window) && (oldFlags&Qt::Window) && !q->testAttribute(Qt::WA_NativeWindow)) {
         //qDebug() << "setParent_sys() change from toplevel";
         q->destroy();
-    } else if (wasCreated) {
+    } else if (newparent && wasCreated) {
         q->createWinId();
     }
 
-- 
cgit v1.2.3