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

Change-Id: Ia02971527a2d1a80c5624d69330428818aab3a41

diff --cc src/qml/util/qqmlpropertymap.h
Simple merge

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

diff --cc src/quick/scenegraph/util/qsgsimplematerial.h
Simple merge

diff --cc src/quick/scenegraph/util/qsgtexturematerial.h
Simple merge

diff --cc tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
Simple merge

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

diff --cc tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
Simple merge

diff --cc tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
Simple merge

diff --cc tests/auto/quick/quick.pro
Simple merge