Merge remote-tracking branch 'origin/5.3' into dev
authorSimon Hausmann <simon.hausmann@digia.com>
Sat, 26 Jul 2014 07:14:44 +0000 (09:14 +0200)
committerSimon Hausmann <simon.hausmann@digia.com>
Sat, 26 Jul 2014 11:21:16 +0000 (13:21 +0200)
commit75d8ebb3e6925f500ddeefe2ab491be2ae83264c
tree6874c91386434f4a1934a9555a3f1d5daf69434c
parentfcb40ff6d71f4561401e6b2bd4d7fc706fff8eee
parentba8416b80f42c81387170620472194e7a76429b8
Merge remote-tracking branch 'origin/5.3' into dev

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

Change-Id: Ie3ef6202b6a3a8521971e1be10c40c6a2db6989c
13 files changed:
src/qml/compiler/qv4ssa.cpp
src/qml/jsruntime/qv4arrayobject.cpp
src/qml/jsruntime/qv4engine.cpp
src/qml/qml/qqmlcomponent.cpp
src/qmltest/quicktestresult.cpp
src/quick/items/qquickgridview.cpp
src/quick/items/qquickitemview.cpp
src/quick/items/qquickitemview_p_p.h
src/quick/items/qquicklistview.cpp
src/quick/items/qquickpathview.cpp
src/quick/items/qquickwindow.cpp
src/quick/scenegraph/util/qsgatlastexture.cpp
tests/auto/quick/qquicklistview/tst_qquicklistview.cpp