Make QBoundingVolumeDebug private

QML type exported though, need to decide where/how to hide it

Change-Id: I2d341456c3e09101da895ccd4a925f85a01089b0
Task-number: QTBUG-51449
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

11 files changed, 23 insertions, 21 deletions

diff --git a/examples/qt3d/picking-qml/picking-qml.pro b/examples/qt3d/picking-qml/picking-qml.pro
index 1954c7426..6639f745f 100644
--- a/examples/qt3d/picking-qml/picking-qml.pro
+++ b/examples/qt3d/picking-qml/picking-qml.pro
@@ -2,7 +2,7 @@
     error( "Couldn't find the examples.pri file!" )
 }
 
-QT += 3dcore 3drender 3dinput 3dquick qml quick
+QT += 3dcore 3drender 3drender-private 3dinput 3dquick qml quick
 
 SOURCES += main.cpp
 
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
index 49eb7c0dc..3eaefa5a0 100644
--- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
+++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
@@ -107,7 +107,6 @@
 #include <Qt3DRender/qobjectpicker.h>
 #include <Qt3DRender/qpickevent.h>
 #include <Qt3DRender/qboundingvolumespecifier.h>
-#include <Qt3DRender/qboundingvolumedebug.h>
 #include <Qt3DRender/qfrustumculling.h>
 #include <Qt3DRender/qlighting.h>
 #include <Qt3DRender/qdispatchcompute.h>
@@ -116,6 +115,7 @@
 #include <Qt3DRender/qcamera.h>
 #include <Qt3DRender/qrendersettings.h>
 #include <Qt3DRender/qpickingsettings.h>
+#include <Qt3DRender/private/qboundingvolumedebug_p.h>
 #include <Qt3DQuickRender/private/quick3dtechnique_p.h>
 #include <Qt3DQuickRender/private/quick3dmaterial_p.h>
 #include <Qt3DQuickRender/private/quick3dtechniquefilter_p.h>
diff --git a/src/render/backend/boundingvolumedebug.cpp b/src/render/backend/boundingvolumedebug.cpp
index bb6cea52e..d6226dbc7 100644
--- a/src/render/backend/boundingvolumedebug.cpp
+++ b/src/render/backend/boundingvolumedebug.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include "boundingvolumedebug_p.h"
-#include <Qt3DRender/qboundingvolumedebug.h>
+#include <Qt3DRender/private/qboundingvolumedebug_p.h>
 #include <Qt3DCore/qbackendscenepropertychange.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/render/backend/entity.cpp b/src/render/backend/entity.cpp
index 49d60af3e..2f8b89f37 100644
--- a/src/render/backend/entity.cpp
+++ b/src/render/backend/entity.cpp
@@ -49,8 +49,8 @@
 #include <Qt3DRender/qshaderdata.h>
 #include <Qt3DRender/qgeometryrenderer.h>
 #include <Qt3DRender/qobjectpicker.h>
-#include <Qt3DRender/qboundingvolumedebug.h>
 #include <Qt3DRender/qcomputecommand.h>
+#include <Qt3DRender/private/qboundingvolumedebug_p.h>
 #include <Qt3DRender/private/geometryrenderermanager_p.h>
 
 #include <Qt3DRender/qcameralens.h>
diff --git a/src/render/frontend/qboundingvolumedebug.cpp b/src/render/frontend/qboundingvolumedebug.cpp
index ef3191b4a..5b6d889bc 100644
--- a/src/render/frontend/qboundingvolumedebug.cpp
+++ b/src/render/frontend/qboundingvolumedebug.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qboundingvolumedebug.h"
+#include "qboundingvolumedebug_p.h"
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/private/qcomponent_p.h>
 #include <Qt3DCore/qbackendscenepropertychange.h>
diff --git a/src/render/frontend/qboundingvolumedebug.h b/src/render/frontend/qboundingvolumedebug_p.h
index 0ca4e93ab..e90909ad6 100644
--- a/src/render/frontend/qboundingvolumedebug.h
+++ b/src/render/frontend/qboundingvolumedebug_p.h
@@ -37,8 +37,19 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_QBOUNDINGVOLUMEDEBUG_H
-#define QT3DRENDER_QBOUNDINGVOLUMEDEBUG_H
+#ifndef QT3DRENDER_QBOUNDINGVOLUMEDEBUG_P_H
+#define QT3DRENDER_QBOUNDINGVOLUMEDEBUG_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
 
 #include <Qt3DCore/qcomponent.h>
 #include <Qt3DRender/qt3drender_global.h>
@@ -80,4 +91,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_QBOUNDINGVOLUMEDEBUG_H
+#endif // QT3DRENDER_QBOUNDINGVOLUMEDEBUG_P_H
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp
index 711ffb0b7..0611166a5 100644
--- a/src/render/frontend/qrenderaspect.cpp
+++ b/src/render/frontend/qrenderaspect.cpp
@@ -70,7 +70,6 @@
 #include <Qt3DRender/qgeometry.h>
 #include <Qt3DRender/qgeometryrenderer.h>
 #include <Qt3DRender/qobjectpicker.h>
-#include <Qt3DRender/qboundingvolumedebug.h>
 #include <Qt3DRender/qfrustumculling.h>
 #include <Qt3DRender/qlight.h>
 #include <Qt3DRender/qlighting.h>
@@ -79,6 +78,7 @@
 #include <Qt3DRender/qrendersurfaceselector.h>
 #include <Qt3DRender/qrendersettings.h>
 
+#include <Qt3DRender/private/qboundingvolumedebug_p.h>
 #include <Qt3DRender/private/cameraselectornode_p.h>
 #include <Qt3DRender/private/layerfilternode_p.h>
 #include <Qt3DRender/private/annotation_p.h>
diff --git a/src/render/frontend/render-frontend.pri b/src/render/frontend/render-frontend.pri
index 6f2a912c1..8d4637919 100644
--- a/src/render/frontend/render-frontend.pri
+++ b/src/render/frontend/render-frontend.pri
@@ -10,7 +10,7 @@ HEADERS += \
     $$PWD/qrendertarget.h \
     $$PWD/qrendertarget_p.h \
     $$PWD/sphere_p.h \
-    $$PWD/qboundingvolumedebug.h \
+    $$PWD/qboundingvolumedebug_p.h \
     $$PWD/qcamera_p.h \
     $$PWD/qcamera.h \
     $$PWD/qcameralens.h \
diff --git a/tests/auto/render/boundingvolumedebug/tst_boundingvolumedebug.cpp b/tests/auto/render/boundingvolumedebug/tst_boundingvolumedebug.cpp
index 96305e8f7..6cbea93d6 100644
--- a/tests/auto/render/boundingvolumedebug/tst_boundingvolumedebug.cpp
+++ b/tests/auto/render/boundingvolumedebug/tst_boundingvolumedebug.cpp
@@ -28,7 +28,7 @@
 
 #include <QtTest/QTest>
 #include <Qt3DRender/private/boundingvolumedebug_p.h>
-#include <Qt3DRender/qboundingvolumedebug.h>
+#include <Qt3DRender/private/qboundingvolumedebug_p.h>
 #include <Qt3DCore/private/qbackendnode_p.h>
 #include <Qt3DCore/qscenepropertychange.h>
 #include "testpostmanarbiter.h"
diff --git a/tests/auto/render/entity/tst_entity.cpp b/tests/auto/render/entity/tst_entity.cpp
index 2ee017f78..044a6ac63 100644
--- a/tests/auto/render/entity/tst_entity.cpp
+++ b/tests/auto/render/entity/tst_entity.cpp
@@ -39,7 +39,6 @@
 #include <Qt3DRender/QShaderData>
 #include <Qt3DRender/QGeometryRenderer>
 #include <Qt3DRender/QObjectPicker>
-#include <Qt3DRender/QBoundingVolumeDebug>
 #include <Qt3DRender/QComputeCommand>
 
 #include "testrenderer.h"
@@ -59,7 +58,6 @@ QNodeId cameraLensUuid(Entity *entity) { return entity->componentUuid<CameraLens
 QNodeId materialUuid(Entity *entity) { return entity->componentUuid<Material>(); }
 QNodeId geometryRendererUuid(Entity *entity) { return entity->componentUuid<GeometryRenderer>(); }
 QNodeId objectPickerUuid(Entity *entity) { return entity->componentUuid<ObjectPicker>(); }
-QNodeId boundingVolumeDebugUuid(Entity *entity) { return entity->componentUuid<BoundingVolumeDebug>(); }
 QNodeId computeJobUuid(Entity *entity) { return entity->componentUuid<ComputeCommand>(); }
 
 QVector<QNodeId> layersUuid(Entity *entity) { return entity->componentsUuid<Layer>(); }
@@ -86,7 +84,6 @@ private slots:
                 << new QObjectPicker
                 << new QLayer
                 << new QShaderData
-                << new QBoundingVolumeDebug
                 << new QComputeCommand;
 
         QTest::newRow("all components") << components;
@@ -107,7 +104,6 @@ private slots:
         QVERIFY(entity.componentUuid<Material>().isNull());
         QVERIFY(entity.componentUuid<GeometryRenderer>().isNull());
         QVERIFY(entity.componentUuid<ObjectPicker>().isNull());
-        QVERIFY(entity.componentUuid<BoundingVolumeDebug>().isNull());
         QVERIFY(entity.componentUuid<ComputeCommand>().isNull());
         QVERIFY(entity.componentsUuid<Layer>().isEmpty());
         QVERIFY(entity.componentsUuid<ShaderData>().isEmpty());
@@ -127,7 +123,6 @@ private slots:
         QVERIFY(!entity.componentUuid<Material>().isNull());
         QVERIFY(!entity.componentUuid<GeometryRenderer>().isNull());
         QVERIFY(!entity.componentUuid<ObjectPicker>().isNull());
-        QVERIFY(!entity.componentUuid<BoundingVolumeDebug>().isNull());
         QVERIFY(!entity.componentsUuid<Layer>().isEmpty());
         QVERIFY(!entity.componentsUuid<Layer>().isEmpty());
         QVERIFY(!entity.componentsUuid<ShaderData>().isEmpty());
@@ -143,7 +138,6 @@ private slots:
         QVERIFY(entity.componentUuid<Material>().isNull());
         QVERIFY(entity.componentUuid<GeometryRenderer>().isNull());
         QVERIFY(entity.componentUuid<ObjectPicker>().isNull());
-        QVERIFY(entity.componentUuid<BoundingVolumeDebug>().isNull());
         QVERIFY(entity.componentsUuid<Layer>().isEmpty());
         QVERIFY(entity.componentsUuid<Layer>().isEmpty());
         QVERIFY(entity.componentsUuid<ShaderData>().isEmpty());
@@ -170,9 +164,6 @@ private slots:
         component = new QObjectPicker;
         QTest::newRow("objectPicker") << component << reinterpret_cast<void*>(objectPickerUuid);
 
-        component = new QBoundingVolumeDebug;
-        QTest::newRow("boundingVolumeDebug") << component << reinterpret_cast<void*>(boundingVolumeDebugUuid);
-
         component = new QComputeCommand;
         QTest::newRow("computeJob") << component << reinterpret_cast<void*>(computeJobUuid);
     }
diff --git a/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp b/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp
index 653c90a3b..a5e3e7f4c 100644
--- a/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp
+++ b/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp
@@ -31,7 +31,7 @@
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DCore/private/qscene_p.h>
 #include <Qt3DCore/qbackendscenepropertychange.h>
-#include <Qt3DRender/QBoundingVolumeDebug>
+#include <Qt3DRender/private/qboundingvolumedebug_p.h>
 
 #include "testpostmanarbiter.h"