Merge remote-tracking branch 'origin/5.7' into 5.8

Conflicts:
	src/input/backend/updateaxisactionjob.cpp
	src/render/renderstates/qalphacoverage.cpp
	src/render/renderstates/qclipplane.cpp
	src/render/renderstates/qdithering.cpp
	src/render/renderstates/qseamlesscubemap.cpp
	src/render/renderstates/qstenciltest.cpp

Change-Id: I5b279d30bbbb06af5e8ee9fc47e9794b78a567f5

1 files changed, 8 insertions, 7 deletions

diff --git a/src/render/io/objloader.cpp b/src/render/io/objloader.cpp
index d9610172f..686a9d5f0 100644
--- a/src/render/io/objloader.cpp
+++ b/src/render/io/objloader.cpp
@@ -60,10 +60,18 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
+struct Entry
+{
+    int start;
+    int size;
+};
+QT3D_DECLARE_TYPEINFO(Qt3DRender, Entry, Q_PRIMITIVE_TYPE)
+
 /*
  * A helper class to split a QByteArray and access its sections without
  * additional memory allocations.
  */
+
 class ByteArraySplitter
 {
 public:
@@ -118,17 +126,10 @@ public:
         return ByteArraySplitter(m_input + m_entries[index].start, m_input + m_entries[index].start + m_entries[index].size, delimiter, splitBehavior);
     }
 
-    struct Entry
-    {
-        int start;
-        int size;
-    };
-
 private:
     QVarLengthArray<Entry, 16> m_entries;
     const char *m_input;
 };
-QT3D_DECLARE_TYPEINFO(Qt3DRender, ByteArraySplitter::Entry, Q_PRIMITIVE_TYPE)
 
 inline uint qHash(const FaceIndices &faceIndices)
 {