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

Change-Id: I15cb7460171b38d11d66367aeb0831ec6e3ca933

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

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

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

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