Make sure the parent widget still exists.v5.0.0-beta1

It may happen that InPlaceWidgetHelper's destructor
is called after parent widget destructor. Now inside
InPlaceWidgetHelper's destructor we check if parent
widget still exists.

Task-number: QTCREATORBUG-7684
Change-Id: I4c9ecbfae7323fd95345ccabc113218a7011ebe8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

2 files changed, 4 insertions, 2 deletions

diff --git a/src/designer/src/components/taskmenu/inplace_widget_helper.cpp b/src/designer/src/components/taskmenu/inplace_widget_helper.cpp
index 9be929483..a6f902cc6 100644
--- a/src/designer/src/components/taskmenu/inplace_widget_helper.cpp
+++ b/src/designer/src/components/taskmenu/inplace_widget_helper.cpp
@@ -65,7 +65,8 @@ namespace qdesigner_internal {
 
     InPlaceWidgetHelper::~InPlaceWidgetHelper()
     {
-        m_parentWidget->setAttribute(Qt::WA_NoChildEventsForParent, m_noChildEvent);
+        if (m_parentWidget)
+            m_parentWidget->setAttribute(Qt::WA_NoChildEventsForParent, m_noChildEvent);
     }
 
     Qt::Alignment InPlaceWidgetHelper::alignment() const {
diff --git a/src/designer/src/components/taskmenu/inplace_widget_helper.h b/src/designer/src/components/taskmenu/inplace_widget_helper.h
index de13a239e..972b5a7d6 100644
--- a/src/designer/src/components/taskmenu/inplace_widget_helper.h
+++ b/src/designer/src/components/taskmenu/inplace_widget_helper.h
@@ -46,6 +46,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QPoint>
 #include <QtCore/QSize>
+#include <QtCore/QPointer>
 #include <qglobal.h>
 
 QT_BEGIN_NAMESPACE
@@ -75,7 +76,7 @@ namespace qdesigner_internal {
         Qt::Alignment alignment() const;
     private:
         QWidget *m_editorWidget;
-        QWidget *m_parentWidget;
+        QPointer<QWidget> m_parentWidget;
         const bool m_noChildEvent;
         QPoint m_posOffset;
         QSize m_sizeOffset;