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

Conflicts:
	src/doc/src/qt3dcollision-module.qdoc
	src/render/frontend/qcamera.cpp
	src/render/frontend/qcameralens.cpp

Change-Id: I8a0ae250a6b8e065a1ef3c817968ebb7ef23b20d

1 files changed, 72 insertions, 0 deletions

diff --git a/examples/qt3d/audio-visualizer-qml/meshes/circle.obj b/examples/qt3d/audio-visualizer-qml/meshes/circle.obj
new file mode 100644
index 000000000..e76bc8659
--- /dev/null
+++ b/examples/qt3d/audio-visualizer-qml/meshes/circle.obj
@@ -0,0 +1,72 @@
+# Blender v2.76 (sub 0) OBJ File: ''
+# www.blender.org
+mtllib circle.mtl
+o Circle
+v 0.000000 0.000000 0.000000
+v 0.000000 0.000000 -1.100000
+v -0.214599 0.000000 -1.078864
+v -0.420952 0.000000 -1.016267
+v -0.611127 0.000000 -0.914617
+v -0.777817 0.000000 -0.777817
+v -0.914617 0.000000 -0.611127
+v -1.016267 0.000000 -0.420952
+v -1.078864 0.000000 -0.214599
+v -1.100000 0.000000 -0.000000
+v -1.078864 0.000000 0.214599
+v -1.016268 0.000000 0.420952
+v -0.914617 0.000000 0.611127
+v -0.777817 0.000000 0.777817
+v -0.611127 0.000000 0.914617
+v -0.420952 0.000000 1.016268
+v -0.214599 0.000000 1.078864
+v 0.000000 0.000000 1.100000
+v 0.214600 0.000000 1.078864
+v 0.420952 0.000000 1.016267
+v 0.611128 0.000000 0.914616
+v 0.777818 0.000000 0.777817
+v 0.914617 0.000000 0.611127
+v 1.016268 0.000000 0.420951
+v 1.078864 0.000000 0.214598
+v 1.100000 0.000000 -0.000001
+v 1.078864 0.000000 -0.214600
+v 1.016267 0.000000 -0.420953
+v 0.914616 0.000000 -0.611128
+v 0.777816 0.000000 -0.777818
+v 0.611126 0.000000 -0.914617
+v 0.420950 0.000000 -1.016268
+v 0.214598 0.000000 -1.078864
+vn 0.000000 1.000000 0.000000
+usemtl None
+s off
+f 1//1 2//1 3//1
+f 1//1 3//1 4//1
+f 1//1 4//1 5//1
+f 1//1 5//1 6//1
+f 1//1 6//1 7//1
+f 1//1 7//1 8//1
+f 1//1 8//1 9//1
+f 1//1 9//1 10//1
+f 1//1 10//1 11//1
+f 1//1 11//1 12//1
+f 1//1 12//1 13//1
+f 1//1 13//1 14//1
+f 1//1 14//1 15//1
+f 1//1 15//1 16//1
+f 1//1 16//1 17//1
+f 1//1 17//1 18//1
+f 1//1 18//1 19//1
+f 1//1 19//1 20//1
+f 1//1 20//1 21//1
+f 1//1 21//1 22//1
+f 1//1 22//1 23//1
+f 1//1 23//1 24//1
+f 1//1 24//1 25//1
+f 1//1 25//1 26//1
+f 1//1 26//1 27//1
+f 1//1 27//1 28//1
+f 1//1 28//1 29//1
+f 1//1 29//1 30//1
+f 1//1 30//1 31//1
+f 1//1 31//1 32//1
+f 1//1 32//1 33//1
+f 1//1 33//1 2//1