From: Andrey Paskal <apaskal@gmail.com>
Date: Thu, 24 Dec 2009 16:37:40 +0000 (+0300)
Subject: Fix designer segfault on startup.
X-Git-Url: https://gitweb.ananas.su/?a=commitdiff_plain;h=227ef1cee56a96bfc623e37ca01809119b9ef67c;p=projects%2Fananas-labs-qt4.git

Fix designer segfault on startup.
---

diff --git a/src/lib/widgets/awidget.cpp b/src/lib/widgets/awidget.cpp
index 6cbb20f..070cd64 100644
--- a/src/lib/widgets/awidget.cpp
+++ b/src/lib/widgets/awidget.cpp
@@ -516,8 +516,10 @@ aWidget::widgetEditor(  QWidget *object, QDialog *editor )
 aWidget *
 aWidget::parentContainer( QWidget *w )
 {
+        QWidget* prev;
         while ( w )
 	{
+                prev = w;
                 w = w->parentWidget();
                 if ( w )
 		{
@@ -527,6 +529,7 @@ aWidget::parentContainer( QWidget *w )
 			}
 		}
         }
+        if (!w) w = prev;
         return ( aWidget *) w;
 }