Merge remote-tracking branch 'origin/stable' into dev
authorSimon Hausmann <simon.hausmann@digia.com>
Tue, 18 Feb 2014 08:58:57 +0000 (09:58 +0100)
committerSimon Hausmann <simon.hausmann@digia.com>
Tue, 18 Feb 2014 08:58:57 +0000 (09:58 +0100)
commitba9ca0e3d64c46fc63cdbc62f3e4a96e36a842f8
treef9631624c841281302a2a546fbcc06a2375f410e
parenta65b8785621ebf58f34eb0c1759376fc0a1117c7
parent464bd2bf975797241213191a374e70431c5c3763
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
src/qml/jsruntime/qv4functionobject.cpp
src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h

Change-Id: Id164f6c3b45501aa466908659ec4e3b957323753
src/qml/compiler/qv4ssa.cpp
src/qml/jsruntime/qv4functionobject.cpp
src/qml/qml/qqmljavascriptexpression.cpp
src/quick/items/qquickitemview.cpp
src/quick/items/qquickrectangle.cpp
src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
src/quick/scenegraph/coreapi/qsgrenderer_p.h
src/quick/scenegraph/qsgcontext.cpp
src/quick/scenegraph/qsgcontext_p.h
tests/auto/quick/qquickrectangle/tst_qquickrectangle.cpp