Merge branch '5.3' into dev
authorGunnar Sletta <gunnar.sletta@jollamobile.com>
Thu, 7 Aug 2014 09:31:23 +0000 (11:31 +0200)
committerGunnar Sletta <gunnar.sletta@jollamobile.com>
Thu, 7 Aug 2014 09:31:23 +0000 (11:31 +0200)
commit9737b35ac0638dd301b670e940f4e424aab4b4f3
tree2f0225f0f2b05d8422126b2b91a7f0fc73e93700
parent0a43c561891a46477c4e78f6a6d05fd9731ebb04
parent3f5141e5b7227630ca89329a92b6ebddbcb1b7a5
Merge branch '5.3' into dev

Conflicts:
src/quick/items/context2d/qquickcontext2d.cpp
src/quick/items/context2d/qquickcontext2dtexture.cpp

Change-Id: I1a9b911b3a92333a5dddbaf43275f71bad2006f0
src/qml/qml/qqmlcomponent.cpp
src/qml/types/qqmldelegatemodel.cpp
src/quick/items/context2d/qquickcontext2d.cpp
src/quick/items/context2d/qquickcontext2dtexture.cpp
src/quick/items/context2d/qquickcontext2dtexture_p.h
src/quick/items/qquickwindow.cpp
tests/auto/quick/qquicklistview/tst_qquicklistview.cpp