summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hartmann <thomas.hartmann@qt.io>2019-01-18 10:21:44 +0100
committerThomas Hartmann <thomas.hartmann@qt.io>2019-01-21 13:35:08 +0000
commit011f5eb6795e441aaadef6b0f8c38eb904678339 (patch)
tree34b58099bdd8504aafe071ff2c00d63388e24cbb
parent6068f4e299df4c5bfeef71f64e84c5393a7a5b35 (diff)
downloadqt-creator-011f5eb6795e441aaadef6b0f8c38eb904678339.tar.gz
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>
-rw-r--r--src/plugins/qmldesigner/designercore/include/rewriterview.h1
-rw-r--r--src/plugins/qmldesigner/designercore/model/rewriterview.cpp7
2 files changed, 8 insertions, 0 deletions
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