feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Set TextToModelMerger active to false when returning

Browse Source 
Change-Id: I188237d1ca3257f13691063d306e877137a5936d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2018-04-20 12:16:05 +02:00
committed by Tim Jenssen
parent b9278a88d0
commit 2673e09ed6
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
View File

@@ -977,8 +977,11 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH
QList<DocumentMessage> warnings; QList<DocumentMessage> warnings;
if (Document::MutablePtr doc = createParsedDocument(url, data, &errors)) { if (Document::MutablePtr doc = createParsedDocument(url, data, &errors)) {
if (m_document && (m_document->fingerprint() == doc->fingerprint())) if (m_document && (m_document->fingerprint() == doc->fingerprint())) {
return true; setActive(false);
return true;
}
snapshot.insert(doc); snapshot.insert(doc);
m_document = doc; m_document = doc;
qCInfo(rewriterBenchmark) << "parsed correctly: " << time.elapsed(); qCInfo(rewriterBenchmark) << "parsed correctly: " << time.elapsed();