Merge branch '5.10' into dev

Conflicts:
	.qmake.conf

Change-Id: I248aa369ba98659a61e563fd29cc811c76ea1e2d

9 files changed, 8 insertions, 9 deletions

diff --git a/src/render/geometry/buffermanager_p.h b/src/render/geometry/buffermanager_p.h
index 4805955bd..df97a5193 100644
--- a/src/render/geometry/buffermanager_p.h
+++ b/src/render/geometry/buffermanager_p.h
@@ -63,7 +63,6 @@ namespace Render {
 class Q_AUTOTEST_EXPORT BufferManager : public Qt3DCore::QResourceManager<
         Buffer,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::ObjectLevelLockingPolicy>
 {
 public:
diff --git a/src/render/geometry/geometryrenderermanager_p.h b/src/render/geometry/geometryrenderermanager_p.h
index e3b313569..becf1bcc1 100644
--- a/src/render/geometry/geometryrenderermanager_p.h
+++ b/src/render/geometry/geometryrenderermanager_p.h
@@ -63,7 +63,6 @@ namespace Render {
 class Q_AUTOTEST_EXPORT GeometryRendererManager : public Qt3DCore::QResourceManager<
         GeometryRenderer,
         Qt3DCore::QNodeId,
-        16,
         Qt3DCore::ObjectLevelLockingPolicy>
 {
 public:
diff --git a/src/render/geometry/gltfskeletonloader.cpp b/src/render/geometry/gltfskeletonloader.cpp
index 76601836a..b4e33babb 100644
--- a/src/render/geometry/gltfskeletonloader.cpp
+++ b/src/render/geometry/gltfskeletonloader.cpp
@@ -59,7 +59,7 @@ void jsonArrayToSqt(const QJsonArray &jsonArray, Qt3DCore::Sqt &sqt)
     QMatrix4x4 m;
     float *data = m.data();
     int i = 0;
-    for (const auto element : jsonArray)
+    for (const auto &element : jsonArray)
         *(data + i++) = static_cast<float>(element.toDouble());
 
     decomposeQMatrix4x4(m, sqt);
diff --git a/src/render/geometry/qbuffer.h b/src/render/geometry/qbuffer.h
index 09fe54e10..f04c98a11 100644
--- a/src/render/geometry/qbuffer.h
+++ b/src/render/geometry/qbuffer.h
@@ -42,7 +42,7 @@
 
 #include <Qt3DCore/qnode.h>
 #include <Qt3DRender/qt3drender_global.h>
-#include <QSharedPointer>
+#include <QtCore/QSharedPointer>
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/render/geometry/qbufferdatagenerator.h b/src/render/geometry/qbufferdatagenerator.h
index 702f396d4..004eb26eb 100644
--- a/src/render/geometry/qbufferdatagenerator.h
+++ b/src/render/geometry/qbufferdatagenerator.h
@@ -42,7 +42,7 @@
 
 #include <Qt3DRender/qt3drender_global.h>
 #include <Qt3DRender/qabstractfunctor.h>
-#include <QSharedPointer>
+#include <QtCore/QSharedPointer>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/geometry/qgeometryfactory.h b/src/render/geometry/qgeometryfactory.h
index d5d88a45d..2e4d5c821 100644
--- a/src/render/geometry/qgeometryfactory.h
+++ b/src/render/geometry/qgeometryfactory.h
@@ -42,7 +42,7 @@
 
 #include <Qt3DRender/qt3drender_global.h>
 #include <Qt3DRender/qabstractfunctor.h>
-#include <QSharedPointer>
+#include <QtCore/QSharedPointer>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/geometry/qmesh.cpp b/src/render/geometry/qmesh.cpp
index 9a1f10bc5..834284547 100644
--- a/src/render/geometry/qmesh.cpp
+++ b/src/render/geometry/qmesh.cpp
@@ -286,7 +286,7 @@ QGeometry *MeshLoaderFunctor::operator()()
     }
 
     QScopedPointer<QGeometryLoaderInterface> loader;
-    for (QString e: qAsConst(ext)) {
+    for (const QString &e: qAsConst(ext)) {
         loader.reset(qLoadPlugin<QGeometryLoaderInterface, QGeometryLoaderFactory>(geometryLoader(), e));
         if (loader)
             break;
diff --git a/src/render/geometry/qmesh.h b/src/render/geometry/qmesh.h
index fab76a249..51fdab63a 100644
--- a/src/render/geometry/qmesh.h
+++ b/src/render/geometry/qmesh.h
@@ -42,7 +42,7 @@
 
 #include <Qt3DRender/qt3drender_global.h>
 #include <Qt3DRender/qgeometryrenderer.h>
-#include <QUrl>
+#include <QtCore/QUrl>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/geometry/skeleton.cpp b/src/render/geometry/skeleton.cpp
index 075936f37..615b76c88 100644
--- a/src/render/geometry/skeleton.cpp
+++ b/src/render/geometry/skeleton.cpp
@@ -365,7 +365,8 @@ void Skeleton::processJointHierarchy(Qt3DCore::QNodeId jointId,
     skeletonData.jointIndices.insert(jointHandle, jointIndex);
 
     // Recurse to the children
-    for (const auto childJointId : joint->childJointIds())
+    const auto childIds = joint->childJointIds();
+    for (const auto childJointId : childIds)
         processJointHierarchy(childJointId, jointIndex, skeletonData);
 }