summaryrefslogtreecommitdiffstats
path: root/src/core/aspects
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2014-10-10 10:06:31 +0200
committerPaul Lemire <paul.lemire@kdab.com>2014-10-17 15:11:24 +0200
commitdcceb51a72f1b1fa950cd1edf52116f62d9b267f (patch)
tree61ca7371c8085550b5223d4f85c8670720b8fbe7 /src/core/aspects
parent99040c2a71717e2d93b6ea2d0f59f51128f9a4cc (diff)
QChangeArbiter and Observers/Observables made private
Note: the Renderer aspect uses all those private headers, when we introduce the QBackendNode class that will be a wrapper around those, we will be able to remove those private includes. Change-Id: I6240f754e6da251da158cafcf76029ae59000e05 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/core/aspects')
-rw-r--r--src/core/aspects/qabstractaspect_p.h1
-rw-r--r--src/core/aspects/qaspectengine.cpp2
-rw-r--r--src/core/aspects/qaspectmanager.cpp2
3 files changed, 3 insertions, 2 deletions
diff --git a/src/core/aspects/qabstractaspect_p.h b/src/core/aspects/qabstractaspect_p.h
index f4d734f45..213ecbae7 100644
--- a/src/core/aspects/qabstractaspect_p.h
+++ b/src/core/aspects/qabstractaspect_p.h
@@ -43,6 +43,7 @@
#define QT3D_QABSTRACTASPECT_P_H
#include <private/qobject_p.h>
+#include <Qt3DCore/qabstractaspect.h>
QT_BEGIN_NAMESPACE
diff --git a/src/core/aspects/qaspectengine.cpp b/src/core/aspects/qaspectengine.cpp
index f22492e95..6225f3652 100644
--- a/src/core/aspects/qaspectengine.cpp
+++ b/src/core/aspects/qaspectengine.cpp
@@ -44,7 +44,7 @@
#include "qabstractaspect.h"
#include "qaspectthread.h"
#include "qaspectmanager.h"
-#include "qchangearbiter.h"
+#include "qchangearbiter_p.h"
#include "qabstractaspect.h"
#include "qnode.h"
#include "corelogging.h"
diff --git a/src/core/aspects/qaspectmanager.cpp b/src/core/aspects/qaspectmanager.cpp
index e5dd234d8..3f411cc16 100644
--- a/src/core/aspects/qaspectmanager.cpp
+++ b/src/core/aspects/qaspectmanager.cpp
@@ -42,7 +42,7 @@
#include "qaspectmanager.h"
#include "qabstractaspect.h"
-#include "qchangearbiter.h"
+#include "qchangearbiter_p.h"
// TODO Make the kind of job manager configurable (e.g. ThreadWeaver vs Intel TBB)
#include "qjobmanager.h"
#include "qjobmanagerinterface.h"