summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kamm <christian.d.kamm@nokia.com>2010-04-16 11:25:56 +0200
committercon <qtc-committer@nokia.com>2010-04-16 16:34:05 +0200
commita3f2f16d5ced9a2749cc63db0edb1bff609b7619 (patch)
treea9e9b9fd758b8d556706431b073533969ff6f2ab
parentf39130b56d2669ff8627717c3d358af93d50c394 (diff)
downloadqt-creator-a3f2f16d5ced9a2749cc63db0edb1bff609b7619.tar.gz
QmlJSEditor: Prevent an infinite parsing loop with invalid qml/js files.
Reviewed-by: Erik Verbruggen (cherry picked from commit 922092937565dfa02f4055fdf84358f9cceace61)
-rw-r--r--src/plugins/qmljseditor/qmljseditor.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index 67b299755c..344830e90b 100644
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/src/plugins/qmljseditor/qmljseditor.cpp
@@ -1364,6 +1364,7 @@ SemanticInfo SemanticHighlighter::semanticInfo(const Source &source)
if (! doc) {
snapshot = source.snapshot;
doc = snapshot.documentFromSource(source.code, source.fileName);
+ doc->setDocumentRevision(source.revision);
doc->parse();
}