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

Change-Id: If9a205bea219b9aca95d78b1e556ca9bbff58dd0

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

diff --cc src/quick/items/context2d/qquickcanvasitem.cpp
Simple merge

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

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

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

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

diff --cc tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
Simple merge

diff --cc tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp
Simple merge