QmlDesigner.nodeInstances: show warning if qml pupped crashes

If the qml puppetcrahes 3 times in a row we show a warning.

Reviewed-by: Marco Bubke

diff --git a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h
index 6449b6f..31b9df9 100644 (file)
--- a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h
+++ b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h
@@ -138,6 +138,9 @@ public:
 
     QImage statePreviewImage(const ModelNode &stateNode) const;
 
+signals:
+    void qmlPuppetCrashed();
+
 private: // functions
     NodeInstance rootNodeInstance() const;
 

diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
index ce96061..1e0ad0b 100644 (file)
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
@@ -180,7 +180,7 @@ void NodeInstanceView::handleChrash()
     if (elaspsedTimeSinceLastCrash > 2000) {
         restartProcess();
     } else {
-        emitCustomNotification("QmlPuppet crashed");
+        emit  qmlPuppetCrashed();
     }
 }
 

diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp
index db03b1f..da47571 100644 (file)
--- a/src/plugins/qmldesigner/designmodewidget.cpp
+++ b/src/plugins/qmldesigner/designmodewidget.cpp
@@ -648,6 +648,7 @@ void DesignModeWidget::setup()
     }
 
     m_nodeInstanceView = new NodeInstanceView(this);
+    connect(m_nodeInstanceView.data(), SIGNAL(qmlPuppetCrashed()), this, SLOT(qmlPuppetCrashed()));
      // Sidebar takes ownership
     m_navigator = new NavigatorView;
     m_allPropertiesBox = new AllPropertiesBox;
@@ -773,6 +774,14 @@ void DesignModeWidget::deleteSidebarWidgets()
     m_rightSideBar = 0;
 }
 
+void DesignModeWidget::qmlPuppetCrashed()
+{
+    QList<RewriterView::Error> errorList;
+    RewriterView::Error error(tr("Qt Quick emulation layer crashed"));
+    errorList << error;
+    disable(errorList);
+}
+
 void DesignModeWidget::resizeEvent(QResizeEvent *event)
 {
     if (m_warningWidget)

diff --git a/src/plugins/qmldesigner/designmodewidget.h b/src/plugins/qmldesigner/designmodewidget.h
index 93074b1..a49c604 100644 (file)
--- a/src/plugins/qmldesigner/designmodewidget.h
+++ b/src/plugins/qmldesigner/designmodewidget.h
@@ -154,6 +154,7 @@ private slots:
     void updateAvailableSidebarItemsRight();
 
     void deleteSidebarWidgets();
+    void qmlPuppetCrashed();
 
 protected:
     void resizeEvent(QResizeEvent *event);