Merge branch '5.10' into dev

Conflicts:
	.qmake.conf

Change-Id: I248aa369ba98659a61e563fd29cc811c76ea1e2d

5 files changed, 37 insertions, 53 deletions

diff --git a/src/input/backend/assignkeyboardfocusjob.cpp b/src/input/backend/assignkeyboardfocusjob.cpp
index 216c914d4..385074812 100644
--- a/src/input/backend/assignkeyboardfocusjob.cpp
+++ b/src/input/backend/assignkeyboardfocusjob.cpp
@@ -67,7 +67,7 @@ void AssignKeyboardFocusJob::run()
 {
     KeyboardDevice *keyboardDevice = m_inputHandler->keyboardDeviceManager()->lookupResource(m_keyboardDevice);
     const auto handles = m_inputHandler->keyboardInputManager()->activeHandles();
-    for (const HKeyboardHandler handle : handles) {
+    for (const HKeyboardHandler &handle : handles) {
         KeyboardHandler *input = m_inputHandler->keyboardInputManager()->data(handle);
         Q_ASSERT(input);
         if (input->keyboardDevice() == m_keyboardDevice) {
diff --git a/src/input/backend/axisaccumulatorjob.cpp b/src/input/backend/axisaccumulatorjob.cpp
index 03e680ddb..cda8a5e26 100644
--- a/src/input/backend/axisaccumulatorjob.cpp
+++ b/src/input/backend/axisaccumulatorjob.cpp
@@ -62,7 +62,7 @@ void AxisAccumulatorJob::run()
 {
     // Iterate over the accumulators and ask each to step the integrations
     const auto activeHandles = m_axisAccumulatorManager->activeHandles();
-    for (auto accumulatorHandle : activeHandles) {
+    for (const auto &accumulatorHandle : activeHandles) {
         AxisAccumulator *accumulator = m_axisAccumulatorManager->data(accumulatorHandle);
         if (accumulator->isEnabled())
             accumulator->stepIntegration(m_axisManager, m_dt);
diff --git a/src/input/backend/handle_types_p.h b/src/input/backend/handle_types_p.h
index c132fdc99..cfe4e66b4 100644
--- a/src/input/backend/handle_types_p.h
+++ b/src/input/backend/handle_types_p.h
@@ -75,22 +75,22 @@ class GenericDeviceBackendNode;
 class PhysicalDeviceProxy;
 class AxisAccumulator;
 
-typedef Qt3DCore::QHandle<KeyboardDevice, 8> HKeyboardDevice;
-typedef Qt3DCore::QHandle<KeyboardHandler, 16> HKeyboardHandler;
-typedef Qt3DCore::QHandle<MouseHandler, 16> HMouseHandler;
-typedef Qt3DCore::QHandle<MouseDevice, 8> HMouseDevice;
-typedef Qt3DCore::QHandle<Axis, 16> HAxis;
-typedef Qt3DCore::QHandle<AxisActionHandler, 16> HAxisActionHandler;
-typedef Qt3DCore::QHandle<AxisSetting, 16> HAxisSetting;
-typedef Qt3DCore::QHandle<Action, 16> HAction;
-typedef Qt3DCore::QHandle<AbstractAxisInput, 16> HAxisInput;
-typedef Qt3DCore::QHandle<ActionInput, 16> HActionInput;
-typedef Qt3DCore::QHandle<InputSequence, 16> HInputSequence;
-typedef Qt3DCore::QHandle<InputChord, 16> HInputChord;
-typedef Qt3DCore::QHandle<LogicalDevice, 16> HLogicalDevice;
-typedef Qt3DCore::QHandle<GenericDeviceBackendNode, 8> HGenericDeviceBackendNode;
-typedef Qt3DCore::QHandle<PhysicalDeviceProxy, 16> HPhysicalDeviceProxy;
-typedef Qt3DCore::QHandle<AxisAccumulator, 16> HAxisAccumulator;
+typedef Qt3DCore::QHandle<KeyboardDevice> HKeyboardDevice;
+typedef Qt3DCore::QHandle<KeyboardHandler> HKeyboardHandler;
+typedef Qt3DCore::QHandle<MouseHandler> HMouseHandler;
+typedef Qt3DCore::QHandle<MouseDevice> HMouseDevice;
+typedef Qt3DCore::QHandle<Axis> HAxis;
+typedef Qt3DCore::QHandle<AxisActionHandler> HAxisActionHandler;
+typedef Qt3DCore::QHandle<AxisSetting> HAxisSetting;
+typedef Qt3DCore::QHandle<Action> HAction;
+typedef Qt3DCore::QHandle<AbstractAxisInput> HAxisInput;
+typedef Qt3DCore::QHandle<ActionInput> HActionInput;
+typedef Qt3DCore::QHandle<InputSequence> HInputSequence;
+typedef Qt3DCore::QHandle<InputChord> HInputChord;
+typedef Qt3DCore::QHandle<LogicalDevice> HLogicalDevice;
+typedef Qt3DCore::QHandle<GenericDeviceBackendNode> HGenericDeviceBackendNode;
+typedef Qt3DCore::QHandle<PhysicalDeviceProxy> HPhysicalDeviceProxy;
+typedef Qt3DCore::QHandle<AxisAccumulator> HAxisAccumulator;
 
 } // namespace Input
 } // namespace Qt3DInput
diff --git a/src/input/backend/inputhandler.cpp b/src/input/backend/inputhandler.cpp
index 525a45b6c..18559e9d4 100644
--- a/src/input/backend/inputhandler.cpp
+++ b/src/input/backend/inputhandler.cpp
@@ -221,7 +221,7 @@ QVector<Qt3DCore::QAspectJobPtr> InputHandler::keyboardJobs()
     QVector<QAspectJobPtr> jobs;
     const QList<QT_PREPEND_NAMESPACE(QKeyEvent)> events = pendingKeyEvents();
 
-    for (const HKeyboardDevice cHandle : qAsConst(m_activeKeyboardDevices)) {
+    for (const HKeyboardDevice &cHandle : qAsConst(m_activeKeyboardDevices)) {
         KeyboardDevice *keyboardDevice = m_keyboardDeviceManager->data(cHandle);
         if (keyboardDevice) {
             keyboardDevice->updateKeyEvents(events);
@@ -254,7 +254,7 @@ QVector<Qt3DCore::QAspectJobPtr> InputHandler::mouseJobs()
     const QList<QT_PREPEND_NAMESPACE(QWheelEvent)> wheelEvents = pendingWheelEvents();
 #endif
 
-    for (const HMouseDevice cHandle : qAsConst(m_activeMouseDevices)) {
+    for (const HMouseDevice &cHandle : qAsConst(m_activeMouseDevices)) {
         MouseDevice *controller = m_mouseDeviceManager->data(cHandle);
 
         controller->updateMouseEvents(mouseEvents);
@@ -269,7 +269,7 @@ QVector<Qt3DCore::QAspectJobPtr> InputHandler::mouseJobs()
                                     ) {
             // Send the events to the mouse handlers that have for sourceDevice controller
             const QVector<HMouseHandler> activeMouseHandlers = m_mouseInputManager->activeHandles();
-            for (HMouseHandler mouseHandlerHandle : activeMouseHandlers) {
+            for (const HMouseHandler &mouseHandlerHandle : activeMouseHandlers) {
 
                 MouseHandler *mouseHandler = m_mouseInputManager->data(mouseHandlerHandle);
                 Q_ASSERT(mouseHandler);
diff --git a/src/input/backend/inputmanagers_p.h b/src/input/backend/inputmanagers_p.h
index 956b0ab8b..eee8b27d3 100644
--- a/src/input/backend/inputmanagers_p.h
+++ b/src/input/backend/inputmanagers_p.h
@@ -79,8 +79,7 @@ namespace Input {
 
 class KeyboardInputManager : public Qt3DCore::QResourceManager<
         KeyboardHandler,
-        Qt3DCore::QNodeId,
-        16>
+        Qt3DCore::QNodeId>
 {
 public:
     KeyboardInputManager() {}
@@ -88,8 +87,7 @@ public:
 
 class KeyboardDeviceManager : public Qt3DCore::QResourceManager<
         KeyboardDevice,
-        Qt3DCore::QNodeId,
-        8>
+        Qt3DCore::QNodeId>
 {
 public:
     KeyboardDeviceManager() {}
@@ -97,8 +95,7 @@ public:
 
 class MouseDeviceManager : public Qt3DCore::QResourceManager<
         MouseDevice,
-        Qt3DCore::QNodeId,
-        8>
+        Qt3DCore::QNodeId>
 {
 public:
     MouseDeviceManager() {}
@@ -106,8 +103,7 @@ public:
 
 class MouseInputManager : public Qt3DCore::QResourceManager<
         MouseHandler,
-        Qt3DCore::QNodeId,
-        16>
+        Qt3DCore::QNodeId>
 {
 public:
     MouseInputManager() {}
@@ -115,8 +111,7 @@ public:
 
 class AxisManager : public Qt3DCore::QResourceManager<
         Axis,
-        Qt3DCore::QNodeId,
-        16>
+        Qt3DCore::QNodeId>
 {
 public:
     AxisManager() {}
@@ -124,8 +119,7 @@ public:
 
 class AxisSettingManager : public Qt3DCore::QResourceManager<
         AxisSetting,
-        Qt3DCore::QNodeId,
-        16>
+        Qt3DCore::QNodeId>
 {
 public:
     AxisSettingManager() {}
@@ -133,8 +127,7 @@ public:
 
 class ActionManager : public Qt3DCore::QResourceManager<
         Action,
-        Qt3DCore::QNodeId,
-        16>
+        Qt3DCore::QNodeId>
 {
 public:
     ActionManager() {}
@@ -142,8 +135,7 @@ public:
 
 class ActionInputManager : public Qt3DCore::QResourceManager<
         ActionInput,
-        Qt3DCore::QNodeId,
-        16>
+        Qt3DCore::QNodeId>
 {
 public:
     ActionInputManager() {}
@@ -151,8 +143,7 @@ public:
 
 class AnalogAxisInputManager : public Qt3DCore::QResourceManager<
         AnalogAxisInput,
-        Qt3DCore::QNodeId,
-        16>
+        Qt3DCore::QNodeId>
 {
 public:
     AnalogAxisInputManager() {}
@@ -160,8 +151,7 @@ public:
 
 class ButtonAxisInputManager : public Qt3DCore::QResourceManager<
         ButtonAxisInput,
-        Qt3DCore::QNodeId,
-        16>
+        Qt3DCore::QNodeId>
 {
 public:
     ButtonAxisInputManager() {}
@@ -169,8 +159,7 @@ public:
 
 class InputChordManager : public Qt3DCore::QResourceManager<
         InputChord,
-        Qt3DCore::QNodeId,
-        16>
+        Qt3DCore::QNodeId>
 {
 public:
     InputChordManager() {}
@@ -178,8 +167,7 @@ public:
 
 class InputSequenceManager : public Qt3DCore::QResourceManager<
         InputSequence,
-        Qt3DCore::QNodeId,
-        16>
+        Qt3DCore::QNodeId>
 {
 public:
     InputSequenceManager() {}
@@ -187,8 +175,7 @@ public:
 
 class LogicalDeviceManager : public Qt3DCore::QResourceManager<
         LogicalDevice,
-        Qt3DCore::QNodeId,
-        16>
+        Qt3DCore::QNodeId>
 {
 public:
     LogicalDeviceManager() {}
@@ -203,8 +190,7 @@ private:
 
 class GenericDeviceBackendNodeManager : public Qt3DCore::QResourceManager<
         GenericDeviceBackendNode,
-        Qt3DCore::QNodeId,
-        8>
+        Qt3DCore::QNodeId>
 {
 public:
     GenericDeviceBackendNodeManager() {}
@@ -212,8 +198,7 @@ public:
 
 class Q_AUTOTEST_EXPORT PhysicalDeviceProxyManager : public Qt3DCore::QResourceManager<
         PhysicalDeviceProxy,
-        Qt3DCore::QNodeId,
-        16>
+        Qt3DCore::QNodeId>
 {
 public:
     PhysicalDeviceProxyManager() {}
@@ -227,8 +212,7 @@ private:
 
 class AxisAccumulatorManager : public Qt3DCore::QResourceManager<
         AxisAccumulator,
-        Qt3DCore::QNodeId,
-        16>
+        Qt3DCore::QNodeId>
 {
 public:
     AxisAccumulatorManager() {}