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

Change-Id: I30f9c925631991ceb22339d1333936faecffbaf4

diff --cc src/qml/jsruntime/qv4managed_p.h
Simple merge

diff --cc src/qml/qml/qqmlxmlhttprequest.cpp
Simple merge

diff --cc src/quick/items/qquickitem.cpp
Simple merge

diff --cc src/quick/items/qquicktextedit_p_p.h
Simple merge

diff --cc tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
Simple merge