Merge remote-tracking branch 'origin/stable' into dev
authorSimon Hausmann <simon.hausmann@digia.com>
Tue, 11 Feb 2014 10:08:11 +0000 (11:08 +0100)
committerSimon Hausmann <simon.hausmann@digia.com>
Tue, 11 Feb 2014 11:00:31 +0000 (12:00 +0100)
commit7c9497a6d47a02d961baef3993ba4cf4267ec607
tree335fae3e9e3a84d33310efca23f1d6993265805b
parent67ba88947f57ab2d1859bbeb96c6dcba020561b1
parent6c840c70d61c3ae277b60a024a086215c743e5b3
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
src/qml/compiler/qv4ssa.cpp
src/qml/jsruntime/qv4arrayobject.cpp
src/qml/jsruntime/qv4context.cpp

Change-Id: Ied5b23bec4dc14abe51127c507aed668f855c1e1
28 files changed:
examples/quick/quick.pro
src/qml/compiler/qv4isel_masm.cpp
src/qml/compiler/qv4isel_masm_p.h
src/qml/compiler/qv4regalloc.cpp
src/qml/compiler/qv4ssa.cpp
src/qml/jsruntime/qv4arrayobject.cpp
src/qml/jsruntime/qv4context.cpp
src/qml/jsruntime/qv4context_p.h
src/qml/jsruntime/qv4qobjectwrapper.cpp
src/qml/qml/qqmlengine.cpp
src/qml/qml/qqmllocale.cpp
src/qml/qml/qqmlvme.cpp
src/quick/items/qquickitem.cpp
src/quick/items/qquickitemview.cpp
src/quick/items/qquicktext.cpp
src/quick/items/qquicktranslate.cpp
src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
src/quick/scenegraph/qsgcontext.cpp
src/quick/scenegraph/qsgcontext_p.h
src/quick/scenegraph/qsgrenderloop.cpp
src/quick/scenegraph/qsgthreadedrenderloop.cpp
src/quick/scenegraph/qsgwindowsrenderloop.cpp
src/quick/util/qquickpropertychanges.cpp
tests/auto/qml/qjsengine/tst_qjsengine.cpp
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp
tests/auto/quick/qquicklistview/tst_qquicklistview.cpp