From 180653128ff2373e09a85a82772ca276d872ea1a Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Mon, 3 Apr 2017 15:39:07 +0200 Subject: [PATCH] QmlDesigner: Reset error messages wehen restarting puppet We store generic error messages in the root node. Those have to be reset. Also we have to reset the type icon if there is no error anymore. Change-Id: Ibe6274f651113f26aef6240bb9efa005862378f4 Reviewed-by: Tim Jenssen --- .../qmldesigner/components/navigator/navigatortreemodel.cpp | 1 + .../qmldesigner/designercore/instances/nodeinstanceview.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp index 6f8968cda2..3a0a602b5b 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp @@ -380,6 +380,7 @@ void NavigatorTreeModel::updateItemRow(const ModelNode &modelNode, ItemRow items items.idItem->setToolTip(QString::fromUtf8(modelNode.type())); else items.idItem->setToolTip(msgUnknownItem(QString::fromUtf8(modelNode.type()))); + items.idItem->setIcon(getTypeIcon(modelNode)); } blockItemChangedSignal(blockSignal); diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp index dd9b66d57b..a88184bbbd 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp @@ -199,6 +199,10 @@ void NodeInstanceView::handleCrash() void NodeInstanceView::restartProcess() { + if (rootNodeInstance().isValid()) + rootNodeInstance().setError({}); + emitInstanceErrorChange({}); + if (m_restartProcessTimerId) killTimer(m_restartProcessTimerId); -- GitLab