From 2673e09ed6e1c22e4eae66db97095356721a1c6e Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Fri, 20 Apr 2018 12:16:05 +0200
Subject: [PATCH] QmlDesigner: Set TextToModelMerger active to false when
 returning

Change-Id: I188237d1ca3257f13691063d306e877137a5936d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../qmldesigner/designercore/model/texttomodelmerger.cpp   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index 94d92534312..c08f595dbb1 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -977,8 +977,11 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH
         QList<DocumentMessage> warnings;
 
         if (Document::MutablePtr doc = createParsedDocument(url, data, &errors)) {
-            if (m_document && (m_document->fingerprint() == doc->fingerprint()))
-                    return true;
+            if (m_document && (m_document->fingerprint() == doc->fingerprint())) {
+                setActive(false);
+                return true;
+            }
+
             snapshot.insert(doc);
             m_document = doc;
             qCInfo(rewriterBenchmark) << "parsed correctly: " << time.elapsed();