Merge branch 'stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 4 Jan 2013 11:48:06 +0000 (12:48 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 4 Jan 2013 11:48:06 +0000 (12:48 +0100)
commit5d150f63e1a188414e4951c4b6e4c7c474d9b4e6
treed249fdfd8480b367ad238b62602f48254dceda11
parent63064c7ed7a23c1749ed7f58d55b680190dc01c4
parentef92d6f8ef649fdaf50c123c6ca978b6db6892f6
Merge branch 'stable' into dev

Conflicts:
src/qml/qml/parser/qqmljskeywords_p.h
sync.profile
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp

Change-Id: I9bc6659e1bab924009167bec567354d40a77a8cb
src/qml/qml/parser/qqmljskeywords_p.h
src/qml/qml/v4/qv4irbuilder.cpp
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
tools/qmlscene/main.cpp