QAspectManager: Explicitly mark as private API

Also remove some unnecessary includes.

Change-Id: I35539566e530f7800bbbe7884be65a93a7ee91eb
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

11 files changed, 2 insertions, 12 deletions

diff --git a/src/collision/qcollisionaspect.cpp b/src/collision/qcollisionaspect.cpp
index f09a5c1f5..33fa826eb 100644
--- a/src/collision/qcollisionaspect.cpp
+++ b/src/collision/qcollisionaspect.cpp
@@ -41,7 +41,6 @@
 #include <Qt3DCore/qscenepropertychange.h>
 
 #include <Qt3DCore/qnode.h>
-#include <Qt3DCore/private/qaspectmanager_p.h>
 #include <Qt3DCore/private/qchangearbiter_p.h>
 #include <Qt3DCore/private/qscene_p.h>
 #include <Qt3DCore/qaspectfactory.h>
diff --git a/src/core/aspects/qaspectmanager_p.h b/src/core/aspects/qaspectmanager_p.h
index 8c1e372af..9224a90bf 100644
--- a/src/core/aspects/qaspectmanager_p.h
+++ b/src/core/aspects/qaspectmanager_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <QObject>
-#include <Qt3DCore/qt3dcore_global.h>
+#include <Qt3DCore/private/qt3dcore_global_p.h>
 #include <QList>
 #include <QScopedPointer>
 #include <QVariant>
@@ -70,7 +70,7 @@ class QAbstractAspectJobManager;
 class QSceneObserverInterface;
 class QServiceLocator;
 
-class QT3DCORESHARED_EXPORT QAspectManager : public QObject
+class QT3DCORE_PRIVATE_EXPORT QAspectManager : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/logic/qlogicaspect.cpp b/src/logic/qlogicaspect.cpp
index a1d40fd79..e4f993b62 100644
--- a/src/logic/qlogicaspect.cpp
+++ b/src/logic/qlogicaspect.cpp
@@ -45,7 +45,6 @@
 #include <Qt3DCore/qscenepropertychange.h>
 
 #include <Qt3DCore/qnode.h>
-#include <Qt3DCore/private/qaspectmanager_p.h>
 #include <Qt3DCore/private/qchangearbiter_p.h>
 #include <Qt3DCore/private/qscene_p.h>
 #include <Qt3DCore/qaspectfactory.h>
diff --git a/src/render/backend/parameterpack.cpp b/src/render/backend/parameterpack.cpp
index 17b1c3eef..b11be585e 100644
--- a/src/render/backend/parameterpack.cpp
+++ b/src/render/backend/parameterpack.cpp
@@ -35,7 +35,6 @@
 ****************************************************************************/
 
 #include "parameterpack_p.h"
-#include <Qt3DCore/private/qaspectmanager_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp
index 339305164..4a2a62f27 100644
--- a/src/render/backend/renderer.cpp
+++ b/src/render/backend/renderer.cpp
@@ -79,7 +79,6 @@
 
 #include <Qt3DCore/qcameralens.h>
 #include <Qt3DCore/qeventfilterservice.h>
-#include <Qt3DCore/private/qaspectmanager_p.h>
 #include <Qt3DCore/private/qabstractaspectjobmanager_p.h>
 
 #include <QStack>
diff --git a/src/render/backend/transform.cpp b/src/render/backend/transform.cpp
index cb633ace4..08f4d50dd 100644
--- a/src/render/backend/transform.cpp
+++ b/src/render/backend/transform.cpp
@@ -37,7 +37,6 @@
 #include "transform_p.h"
 
 #include <Qt3DCore/qscenepropertychange.h>
-#include <Qt3DCore/private/qaspectmanager_p.h>
 #include <Qt3DCore/private/qchangearbiter_p.h>
 #include <Qt3DCore/qtransform.h>
 
diff --git a/src/render/framegraph/cameraselectornode.cpp b/src/render/framegraph/cameraselectornode.cpp
index 71084a7a5..0193419b6 100644
--- a/src/render/framegraph/cameraselectornode.cpp
+++ b/src/render/framegraph/cameraselectornode.cpp
@@ -37,7 +37,6 @@
 #include "cameraselectornode_p.h"
 #include <Qt3DRender/private/qcameraselector_p.h>
 #include <Qt3DRender/private/renderer_p.h>
-#include <Qt3DCore/private/qaspectmanager_p.h>
 #include <Qt3DCore/private/qchangearbiter_p.h>
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qscenepropertychange.h>
diff --git a/src/render/framegraph/rendertargetselectornode.cpp b/src/render/framegraph/rendertargetselectornode.cpp
index 4e6aa2b8a..f9ba5ed78 100644
--- a/src/render/framegraph/rendertargetselectornode.cpp
+++ b/src/render/framegraph/rendertargetselectornode.cpp
@@ -36,7 +36,6 @@
 
 #include "rendertargetselectornode_p.h"
 #include <Qt3DRender/private/renderer_p.h>
-#include <Qt3DCore/private/qaspectmanager_p.h>
 #include <Qt3DCore/private/qchangearbiter_p.h>
 #include <Qt3DRender/qrendertargetselector.h>
 #include <Qt3DRender/qrendertarget.h>
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp
index e219af188..b2f6aeacf 100644
--- a/src/render/frontend/qrenderaspect.cpp
+++ b/src/render/frontend/qrenderaspect.cpp
@@ -105,7 +105,6 @@
 #include <Qt3DCore/qscenepropertychange.h>
 
 #include <Qt3DCore/qnode.h>
-#include <Qt3DCore/private/qaspectmanager_p.h>
 #include <Qt3DCore/qaspectfactory.h>
 #include <Qt3DCore/qservicelocator.h>
 
diff --git a/src/render/materialsystem/technique.cpp b/src/render/materialsystem/technique.cpp
index 866161bf8..29f4c3f19 100644
--- a/src/render/materialsystem/technique.cpp
+++ b/src/render/materialsystem/technique.cpp
@@ -43,7 +43,6 @@
 #include <Qt3DRender/private/renderer_p.h>
 #include <Qt3DRender/private/annotation_p.h>
 #include <Qt3DRender/private/shader_p.h>
-#include <Qt3DCore/private/qaspectmanager_p.h>
 #include <Qt3DCore/private/qchangearbiter_p.h>
 #include <Qt3DCore/qscenepropertychange.h>
 
diff --git a/src/render/texture/texture.cpp b/src/render/texture/texture.cpp
index f17425705..a411eedc5 100644
--- a/src/render/texture/texture.cpp
+++ b/src/render/texture/texture.cpp
@@ -44,7 +44,6 @@
 #include <Qt3DRender/qtexture.h>
 #include <Qt3DRender/qtexturedata.h>
 #include <Qt3DCore/qscenepropertychange.h>
-#include <Qt3DCore/private/qaspectmanager_p.h>
 #include <Qt3DRender/private/managers_p.h>
 #include <Qt3DRender/private/texturedatamanager_p.h>