Merge branch '5.8' into 5.9

Conflicts:
	src/core/jobs/qthreadpooler.cpp
	src/core/nodes/qcomponent.cpp
	src/core/qpostman.cpp
	src/core/qscene_p.h
	src/core/services/qservicelocator_p.h
	src/input/frontend/qinputaspect.cpp
	src/plugins/sceneparsers/assimp/assimpimporter.cpp
	src/plugins/sceneparsers/assimp/assimpimporter.h
	src/plugins/sceneparsers/gltf/gltfimporter.h
	src/plugins/sceneparsers/gltf/gltfio.cpp
	src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
	src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp
	src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
	src/quick3d/quick3dextras/qt3dquickwindow.cpp

Change-Id: I3566708c6f74a34959e7bb64b64e93647ca3f699

12 files changed, 36 insertions, 36 deletions

diff --git a/src/quick3d/imports/scene3d/qtquickscene3dplugin.cpp b/src/quick3d/imports/scene3d/qtquickscene3dplugin.cpp
index 7103a1bb8..6b9ec96f8 100644
--- a/src/quick3d/imports/scene3d/qtquickscene3dplugin.cpp
+++ b/src/quick3d/imports/scene3d/qtquickscene3dplugin.cpp
@@ -37,9 +37,11 @@
 **
 ****************************************************************************/
 
-#include <QtQml>
 #include "qtquickscene3dplugin.h"
-#include "scene3ditem_p.h"
+
+#include <QtQml>
+
+#include <scene3ditem_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/imports/scene3d/scene3dcleaner.cpp b/src/quick3d/imports/scene3d/scene3dcleaner.cpp
index 06b795c8a..ec371410d 100644
--- a/src/quick3d/imports/scene3d/scene3dcleaner.cpp
+++ b/src/quick3d/imports/scene3d/scene3dcleaner.cpp
@@ -38,13 +38,13 @@
 ****************************************************************************/
 
 #include "scene3dcleaner_p.h"
-#include "scene3dlogging_p.h"
-#include "scene3drenderer_p.h"
 
 #include <Qt3DCore/qaspectengine.h>
-
 #include <QtCore/qthread.h>
 
+#include <scene3dlogging_p.h>
+#include <scene3drenderer_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
diff --git a/src/quick3d/imports/scene3d/scene3dcleaner_p.h b/src/quick3d/imports/scene3d/scene3dcleaner_p.h
index 6ec2c7e6b..a246cbde7 100644
--- a/src/quick3d/imports/scene3d/scene3dcleaner_p.h
+++ b/src/quick3d/imports/scene3d/scene3dcleaner_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QObject>
+#include <QtCore/QObject>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/imports/scene3d/scene3ditem.cpp b/src/quick3d/imports/scene3d/scene3ditem.cpp
index 2c3cc4384..a156b9ef3 100644
--- a/src/quick3d/imports/scene3d/scene3ditem.cpp
+++ b/src/quick3d/imports/scene3d/scene3ditem.cpp
@@ -38,24 +38,23 @@
 ****************************************************************************/
 
 #include "scene3ditem_p.h"
-#include "scene3dcleaner_p.h"
-#include "scene3dlogging_p.h"
-#include "scene3drenderer_p.h"
-#include "scene3dsgnode_p.h"
 
 #include <Qt3DCore/QAspectEngine>
 #include <Qt3DCore/qentity.h>
-#include <Qt3DRender/qcamera.h>
-#include <Qt3DRender/QRenderAspect>
-#include <Qt3DRender/qrendersurfaceselector.h>
-#include <Qt3DRender/private/qrendersurfaceselector_p.h>
 #include <Qt3DInput/QInputAspect>
 #include <Qt3DInput/qinputsettings.h>
 #include <Qt3DLogic/qlogicaspect.h>
-
-
+#include <Qt3DRender/QRenderAspect>
+#include <Qt3DRender/qcamera.h>
+#include <Qt3DRender/qrendersurfaceselector.h>
 #include <QtQuick/qquickwindow.h>
 
+#include <Qt3DRender/private/qrendersurfaceselector_p.h>
+#include <scene3dcleaner_p.h>
+#include <scene3dlogging_p.h>
+#include <scene3drenderer_p.h>
+#include <scene3dsgnode_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
diff --git a/src/quick3d/imports/scene3d/scene3ditem_p.h b/src/quick3d/imports/scene3d/scene3ditem_p.h
index 09859a763..f3d452d3d 100644
--- a/src/quick3d/imports/scene3d/scene3ditem_p.h
+++ b/src/quick3d/imports/scene3d/scene3ditem_p.h
@@ -51,8 +51,8 @@
 // We mean it.
 //
 
-#include <QQuickItem>
 #include <QtCore/qpointer.h>
+#include <QtQuick/QQuickItem>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/imports/scene3d/scene3dlogging_p.h b/src/quick3d/imports/scene3d/scene3dlogging_p.h
index 0f9448d42..91430939f 100644
--- a/src/quick3d/imports/scene3d/scene3dlogging_p.h
+++ b/src/quick3d/imports/scene3d/scene3dlogging_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QLoggingCategory>
+#include <QtCore/QLoggingCategory>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/imports/scene3d/scene3drenderer.cpp b/src/quick3d/imports/scene3d/scene3drenderer.cpp
index d3b9efdb1..f52a071eb 100644
--- a/src/quick3d/imports/scene3d/scene3drenderer.cpp
+++ b/src/quick3d/imports/scene3d/scene3drenderer.cpp
@@ -38,22 +38,20 @@
 ****************************************************************************/
 
 #include "scene3drenderer_p.h"
-#include "scene3dcleaner_p.h"
-#include "scene3ditem_p.h"
-#include "scene3dlogging_p.h"
-#include "scene3dsgnode_p.h"
 
-#include <Qt3DRender/qrenderaspect.h>
-#include <Qt3DRender/private/qrenderaspect_p.h>
 #include <Qt3DCore/qaspectengine.h>
-#include <Qt3DCore/private/qaspectengine_p.h>
-
-#include <QtQuick/qquickwindow.h>
-
+#include <Qt3DRender/qrenderaspect.h>
+#include <QtCore/qthread.h>
 #include <QtGui/qopenglcontext.h>
 #include <QtGui/qopenglframebufferobject.h>
+#include <QtQuick/qquickwindow.h>
 
-#include <QtCore/qthread.h>
+#include <Qt3DRender/private/qrenderaspect_p.h>
+#include <Qt3DCore/private/qaspectengine_p.h>
+#include <scene3dcleaner_p.h>
+#include <scene3ditem_p.h>
+#include <scene3dlogging_p.h>
+#include <scene3dsgnode_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/imports/scene3d/scene3drenderer_p.h b/src/quick3d/imports/scene3d/scene3drenderer_p.h
index 9ff5e7f36..f28501f31 100644
--- a/src/quick3d/imports/scene3d/scene3drenderer_p.h
+++ b/src/quick3d/imports/scene3d/scene3drenderer_p.h
@@ -51,8 +51,7 @@
 // We mean it.
 //
 
-#include <QObject>
-
+#include <QtCore/QObject>
 #include <QtCore/qsize.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h b/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h
index f3817dc05..df431e452 100644
--- a/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h
+++ b/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h
@@ -52,10 +52,10 @@
 //
 
 #include <QtQuick/QSGMaterial>
-#include "scene3dsgmaterialshader_p.h"
-
 #include <QtQuick/qsgtexture.h>
 
+#include <scene3dsgmaterialshader_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
diff --git a/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp b/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp
index 6cef032f7..8a4585558 100644
--- a/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp
+++ b/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp
@@ -38,12 +38,13 @@
 ****************************************************************************/
 
 #include "scene3dsgmaterialshader_p.h"
-#include "scene3dsgmaterial_p.h"
 
 #include <QtGui/qopenglcontext.h>
 #include <QtGui/qopenglfunctions.h>
 #include <QtGui/qsurfaceformat.h>
 
+#include <scene3dsgmaterial_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace {
diff --git a/src/quick3d/imports/scene3d/scene3dsgnode.cpp b/src/quick3d/imports/scene3d/scene3dsgnode.cpp
index ae0a07350..8806b59a9 100644
--- a/src/quick3d/imports/scene3d/scene3dsgnode.cpp
+++ b/src/quick3d/imports/scene3d/scene3dsgnode.cpp
@@ -38,10 +38,11 @@
 ****************************************************************************/
 
 #include "scene3dsgnode_p.h"
-#include "scene3dlogging_p.h"
 
 #include <QtCore/qthread.h>
 
+#include <scene3dlogging_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
diff --git a/src/quick3d/imports/scene3d/scene3dsgnode_p.h b/src/quick3d/imports/scene3d/scene3dsgnode_p.h
index f7b21e2b9..68b68eea5 100644
--- a/src/quick3d/imports/scene3d/scene3dsgnode_p.h
+++ b/src/quick3d/imports/scene3d/scene3dsgnode_p.h
@@ -53,7 +53,7 @@
 
 #include <QtQuick/QSGGeometryNode>
 
-#include "scene3dsgmaterial_p.h"
+#include <scene3dsgmaterial_p.h>
 
 QT_BEGIN_NAMESPACE