Merge remote-tracking branch 'origin/5.4' into dev
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Wed, 29 Oct 2014 09:48:54 +0000 (10:48 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Wed, 29 Oct 2014 09:48:54 +0000 (10:48 +0100)
commit4e33b069c426c975319d91e11223114fd0d8ad40
treed73e1251bc313b7303fdb000c0789cdfb4c7bb1f
parentd9e70d1a49af347f79db7e64bdd8e2e8083a77b5
parent05d8ffb4dff5e693967c8ee7cee6d6158eadccbd
Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
src/quick/items/qquickaccessibleattached_p.h
src/quick/items/qquickwindow.cpp
src/quick/scenegraph/qsgthreadedrenderloop.cpp

Change-Id: I8bf07487a75f9d1b0d6efa5914dd06875fc9654d
14 files changed:
src/particles/qquickparticlesystem.cpp
src/quick/items/qquickflickable.cpp
src/quick/items/qquickitem.cpp
src/quick/items/qquickitem_p.h
src/quick/items/qquickspriteengine.cpp
src/quick/items/qquickspritesequence.cpp
src/quick/items/qquickwindow.cpp
src/quick/items/qquickwindow.h
src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
src/quick/scenegraph/qsgcontext.cpp
src/quick/scenegraph/qsgrenderloop.cpp
src/quick/scenegraph/qsgthreadedrenderloop.cpp
src/quick/scenegraph/qsgwindowsrenderloop.cpp
src/quick/util/qquickanimatorjob.cpp