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, 6 insertions, 7 deletions

diff --git a/tools/qgltf/qgltf.cpp b/tools/qgltf/qgltf.cpp
index 4a68a0d5a..81fef6eea 100644
--- a/tools/qgltf/qgltf.cpp
+++ b/tools/qgltf/qgltf.cpp
@@ -2332,17 +2332,16 @@ void GltfExporter::save(const QString &inputFilename)
     m_obj["meshes"] = meshes;
 
     QJsonObject cameras;
-    for (QHash<QString, Importer::CameraInfo>::const_iterator it = m_importer->cameraInfo().constBegin();
-         it != m_importer->cameraInfo().constEnd(); ++it) {
+    foreach (const Importer::CameraInfo &camInfo, m_importer->cameraInfo()) {
         QJsonObject camera;
         QJsonObject persp;
-        persp["aspect_ratio"] = it->aspectRatio;
-        persp["yfov"] = it->yfov;
-        persp["znear"] = it->znear;
-        persp["zfar"] = it->zfar;
+        persp["aspect_ratio"] = camInfo.aspectRatio;
+        persp["yfov"] = camInfo.yfov;
+        persp["znear"] = camInfo.znear;
+        persp["zfar"] = camInfo.zfar;
         camera["perspective"] = persp;
         camera["type"] = QStringLiteral("perspective");
-        cameras[it->name] = camera;
+        cameras[camInfo.name] = camera;
     }
     m_obj["cameras"] = cameras;