diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-05-16 10:18:40 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-05-16 10:18:40 +0200 |
| commit | 3f2c8a55b18b669e2515325b5f47d220a221471a (patch) | |
| tree | 18d4c6c8358ee275481ebdec2717acc2cec1b95e /src/plugins/qmldesigner | |
| parent | 7d97f4ce2d431d24dcc5f9fe5f2e4467b22b6692 (diff) | |
| parent | ccefc5cf471ae68f44d25f8533fd0e0c44fb8bf8 (diff) | |
| download | qt-creator-3f2c8a55b18b669e2515325b5f47d220a221471a.tar.gz | |
Merge remote-tracking branch 'origin/4.7'
Change-Id: I0ef2f6ac30fb0c020e0f59d2a014d0dd3bab7d81
Diffstat (limited to 'src/plugins/qmldesigner')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index c08f595dbb..9066a65d7e 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -977,10 +977,12 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH QList<DocumentMessage> warnings; if (Document::MutablePtr doc = createParsedDocument(url, data, &errors)) { + /* We cannot do this since changes to other documents do have side effects on the current document if (m_document && (m_document->fingerprint() == doc->fingerprint())) { setActive(false); return true; } + */ snapshot.insert(doc); m_document = doc; |