Merge remote-tracking branch 'origin/5.4' into 5.5

Change-Id: I54e66e992f5e5d441b8b5394e7a03ec5352e7bf3

diff --cc src/qmltest/quicktest.cpp
Simple merge

diff --cc src/quick/scenegraph/qsgrenderloop.cpp
Simple merge

diff --cc src/quick/scenegraph/qsgwindowsrenderloop.cpp
Simple merge

diff --cc src/quick/util/qquickpixmapcache.cpp
Simple merge