projects / platform / upstream / qtdeclarative.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d7134b8) | patch
Fix automatic semicolon insertion. Again.
authorErik Verbruggen <erik.verbruggen@me.com>
Tue, 2 Jul 2013 14:43:59 +0000 (16:43 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 2 Jul 2013 18:57:15 +0000 (20:57 +0200)
commit2ba188dce0d04a7f53ba5ef89f1fcf16cfcdde42
tree2122094f9561ccee7c25f5bc0607cc9d5c37ed0btree | snapshot
parentd7134b8b68f0b3530269f7d087bdecfc8986be6bcommit | diff
Fix automatic semicolon insertion. Again.

After a do-token, no automatic semicolon can be inserted, because that
would result in an empty statement. The issue was that the correct state
was set when a do-token was found, but the state updating logic would
immediately reset it back, resulting in a semicolon insertion.

Change-Id: If867510dfaa182d0fe8b73a5bb1cab299c4faecc
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
src/qml/qml/parser/qqmljslexer.cpp diff | blob | history
tests/auto/qml/qjsengine/tst_qjsengine.cpp diff | blob | history
Domain: UI Framework / Qt;