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

Conflicts:
	tests/auto/render/render.pro

Change-Id: I3d0463dabae4fc78f334afc8f90d2d321ab71e03

3 files changed, 10 insertions, 9 deletions

diff --git a/src/render/io/objloader.cpp b/src/render/io/objloader.cpp
index 3ceab1306..fedb2a0ab 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)
 {
diff --git a/src/render/io/qsceneimporter_p.h b/src/render/io/qsceneimporter_p.h
index 6198f65fd..e76eb8780 100644
--- a/src/render/io/qsceneimporter_p.h
+++ b/src/render/io/qsceneimporter_p.h
@@ -80,7 +80,7 @@ public:
         Loaded,
         Error
     };
-    Q_ENUM(ParserStatus)
+    Q_ENUM(ParserStatus) // LCOV_EXCL_LINE
 
     QSceneImporter();
     virtual ~QSceneImporter();
diff --git a/src/render/io/qsceneloader.h b/src/render/io/qsceneloader.h
index c8eb3c8f6..76f8c4d80 100644
--- a/src/render/io/qsceneloader.h
+++ b/src/render/io/qsceneloader.h
@@ -67,7 +67,7 @@ public:
         Ready,
         Error
     };
-    Q_ENUM(Status)
+    Q_ENUM(Status) // LCOV_EXCL_LINE
 
     enum ComponentType {
         UnknownComponent = 0,