From 011f5eb6795e441aaadef6b0f8c38eb904678339 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Fri, 18 Jan 2019 10:21:44 +0100
Subject: QmlDesigner: Do not set modified to true on load

This was triggered by restoring the aux data.

Task-number: QDS-377
Change-Id: I9cf3c6b2fff3eb318de4a873103d615416912d9c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 src/plugins/qmldesigner/designercore/include/rewriterview.h | 1 +
 src/plugins/qmldesigner/designercore/model/rewriterview.cpp | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/src/plugins/qmldesigner/designercore/include/rewriterview.h b/src/plugins/qmldesigner/designercore/include/rewriterview.h
index c9d2e6dd01..6a69764dbe 100644
--- a/src/plugins/qmldesigner/designercore/include/rewriterview.h
+++ b/src/plugins/qmldesigner/designercore/include/rewriterview.h
@@ -208,6 +208,7 @@ private: //variables
     bool m_instantQmlTextUpdate = false;
     std::function<void(bool)> m_setWidgetStatusCallback;
     bool m_hasIncompleteTypeInformation = false;
+    bool m_restoringAuxData = false;
 
     mutable QHash<int, ModelNode> m_canonicalIntModelNode;
     mutable QHash<ModelNode, int> m_canonicalModelNodeInt;
diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
index 131ffe8fe5..f4cd9c7e79 100644
--- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
+++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
@@ -392,6 +392,9 @@ void RewriterView::deactivateTextMofifierChangeSignals()
 
 void RewriterView::auxiliaryDataChanged(const ModelNode &, const PropertyName &name, const QVariant &)
 {
+    if (m_restoringAuxData)
+        return;
+
     if (name.endsWith("@NodeInstance"))
         return;
 
@@ -1059,6 +1062,8 @@ void RewriterView::restoreAuxiliaryData()
 {
     QTC_ASSERT(m_textModifier, return);
 
+    m_restoringAuxData = true;
+
     setupCanonicalHashes();
 
     const QString text = m_textModifier->text();
@@ -1072,6 +1077,8 @@ void RewriterView::restoreAuxiliaryData()
         QmlJS::SimpleReader reader;
         checkChildNodes(reader.readFromSource(auxSource), this);
     }
+
+    m_restoringAuxData = false;
 }
 
 } //QmlDesigner
-- 
cgit v1.2.1