From 6f07d79e0101392e5193aa7c12748ac2b2878342 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Fri, 16 Mar 2018 12:05:07 +0100
Subject: [PATCH] QmlDesigner: Catch exception in ModelMerger

Exceptions in the merger are very rare but not impossible.
Therefore we have to catch potential exceptions.

Change-Id: I83b2e9e41aa7b21374c06e2401c13df984fe0fd5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../components/integration/designdocumentview.cpp         | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/plugins/qmldesigner/components/integration/designdocumentview.cpp b/src/plugins/qmldesigner/components/integration/designdocumentview.cpp
index bc8930edb6d..ef4e900d0fb 100644
--- a/src/plugins/qmldesigner/components/integration/designdocumentview.cpp
+++ b/src/plugins/qmldesigner/components/integration/designdocumentview.cpp
@@ -24,6 +24,8 @@
 ****************************************************************************/
 
 #include "designdocumentview.h"
+
+#include <exception.h>
 #include <rewriterview.h>
 #include <basetexteditmodifier.h>
 #include <modelmerger.h>
@@ -156,7 +158,11 @@ void DesignDocumentView::fromText(QString text)
 
     if (rewriterView->errors().isEmpty() && rewriterView->rootModelNode().isValid()) {
         ModelMerger merger(this);
-        merger.replaceModel(rewriterView->rootModelNode());
+        try {
+            merger.replaceModel(rewriterView->rootModelNode());
+        } catch(Exception &e) {
+            e.showException();
+        }
     }
 }