Merge remote-tracking branch 'origin/5.4' into 5.5
authorLiang Qi <liang.qi@theqtcompany.com>
Tue, 31 Mar 2015 13:45:45 +0000 (15:45 +0200)
committerLiang Qi <liang.qi@theqtcompany.com>
Tue, 31 Mar 2015 13:45:46 +0000 (15:45 +0200)
commit92dcf9e69e5ed42471d4e02eb165bc80f550129e
treefcb56709e15991d40de4ef695ac27831cb062a38
parent03fa9780fa1ac8bab10f99a59dd3fc2f8f878222
parent22b7fd1c0b93f12585858ac5baabba32408749fd
Merge remote-tracking branch 'origin/5.4' into 5.5

Change-Id: I54e66e992f5e5d441b8b5394e7a03ec5352e7bf3
src/qmltest/quicktest.cpp
src/quick/scenegraph/qsgrenderloop.cpp
src/quick/scenegraph/qsgwindowsrenderloop.cpp
src/quick/util/qquickpixmapcache.cpp