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>
Fix warning from clang.

items/qquicktext.cpp:2160:49: warning: '&&' within '||' [-Wlogical-op-parentheses]
            || vAlign() != QQuickText::AlignTop && heightChanged) {
            ~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~
items/qquicktext.cpp:2160:49: note: place parentheses around the '&&' expression to silence this warning
            || vAlign() != QQuickText::AlignTop && heightChanged) {
                                                ^
               (                                                )

Change-Id: Id4bc18642228e7fad6d674bbcdf623446bb6a00f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>