diff options
| author | Kevin Ottens <kevin.ottens@kdab.com> | 2015-12-03 15:18:38 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-12-12 09:40:42 +0000 |
| commit | c7604c0c2276e2579fe189b6a6000d29fb274a69 (patch) | |
| tree | e64c6f77445751a29bebe945bcf6fab5f00e8337 /src/render | |
| parent | 31ca4a7d17d84deb05f80053f0f1874da894b840 (diff) | |
Turn all services private for now
Change-Id: I9da605c77c5489b9bef4f07079e05f8babb9559f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render')
| -rw-r--r-- | src/render/backend/renderer.cpp | 2 | ||||
| -rw-r--r-- | src/render/frontend/qrenderaspect.cpp | 2 | ||||
| -rw-r--r-- | src/render/jobs/pickboundingvolumejob.cpp | 2 | ||||
| -rw-r--r-- | src/render/raycasting/qabstractcollisionqueryservice_p.h | 2 | ||||
| -rw-r--r-- | src/render/services/vsyncframeadvanceservice.cpp | 1 | ||||
| -rw-r--r-- | src/render/services/vsyncframeadvanceservice_p.h | 2 |
6 files changed, 6 insertions, 5 deletions
diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp index 74a9e3a12..c64d811cd 100644 --- a/src/render/backend/renderer.cpp +++ b/src/render/backend/renderer.cpp @@ -78,7 +78,7 @@ #include <Qt3DRender/private/openglvertexarrayobject_p.h> #include <Qt3DCore/qcameralens.h> -#include <Qt3DCore/qeventfilterservice.h> +#include <Qt3DCore/private/qeventfilterservice_p.h> #include <Qt3DCore/private/qabstractaspectjobmanager_p.h> #include <QStack> diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp index 8b9e48fee..b2b85bddf 100644 --- a/src/render/frontend/qrenderaspect.cpp +++ b/src/render/frontend/qrenderaspect.cpp @@ -122,7 +122,7 @@ #include <Qt3DCore/qtransform.h> #include <Qt3DCore/qnode.h> -#include <Qt3DCore/qservicelocator.h> +#include <Qt3DCore/private/qservicelocator_p.h> #include <QDebug> #include <QOffscreenSurface> diff --git a/src/render/jobs/pickboundingvolumejob.cpp b/src/render/jobs/pickboundingvolumejob.cpp index 768277ad4..d58141022 100644 --- a/src/render/jobs/pickboundingvolumejob.cpp +++ b/src/render/jobs/pickboundingvolumejob.cpp @@ -50,7 +50,7 @@ #include <Qt3DRender/private/triangleboundingvolume_p.h> #include <Qt3DRender/private/qraycastingservice_p.h> #include <Qt3DRender/qgeometryrenderer.h> -#include <Qt3DCore/qservicelocator.h> +#include <Qt3DCore/private/qservicelocator_p.h> #include <Qt3DCore/qray3d.h> #include <QSurface> diff --git a/src/render/raycasting/qabstractcollisionqueryservice_p.h b/src/render/raycasting/qabstractcollisionqueryservice_p.h index 286f4f932..8a6042bf7 100644 --- a/src/render/raycasting/qabstractcollisionqueryservice_p.h +++ b/src/render/raycasting/qabstractcollisionqueryservice_p.h @@ -51,7 +51,7 @@ #include <QVector> #include <Qt3DRender/qt3drender_global.h> -#include <Qt3DCore/qservicelocator.h> +#include <Qt3DCore/private/qservicelocator_p.h> #include <Qt3DCore/qnodeid.h> #include <Qt3DCore/private/qabstractserviceprovider_p.h> #include <Qt3DRender/private/qcollisionqueryresult_p.h> diff --git a/src/render/services/vsyncframeadvanceservice.cpp b/src/render/services/vsyncframeadvanceservice.cpp index 02aca518b..fc166d752 100644 --- a/src/render/services/vsyncframeadvanceservice.cpp +++ b/src/render/services/vsyncframeadvanceservice.cpp @@ -37,6 +37,7 @@ #include "vsyncframeadvanceservice_p.h" #include <Qt3DRender/private/renderlogging_p.h> #include <Qt3DCore/private/qabstractframeadvanceservice_p.h> +#include <Qt3DCore/private/qabstractframeadvanceservice_p_p.h> #include <QSemaphore> #include <QElapsedTimer> diff --git a/src/render/services/vsyncframeadvanceservice_p.h b/src/render/services/vsyncframeadvanceservice_p.h index d09f74efd..2ff1d273a 100644 --- a/src/render/services/vsyncframeadvanceservice_p.h +++ b/src/render/services/vsyncframeadvanceservice_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <Qt3DCore/qabstractframeadvanceservice.h> +#include <Qt3DCore/private/qabstractframeadvanceservice_p.h> QT_BEGIN_NAMESPACE |