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

Change-Id: I4c338a44c1d64c2d8e637971ab3ec6982c40a685

diff --cc src/qml/jsruntime/qv4dateobject.cpp
Simple merge

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

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

diff --cc tests/testapplications/text/textedit.qml
Simple merge