diff options
Diffstat (limited to 'tests/auto')
66 files changed, 145 insertions, 145 deletions
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index b68e55708..69db916da 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -9,10 +9,10 @@ find_package(Qt5Core REQUIRED) include("${_Qt5CTestMacros}") -set(QAspectEngine_NAMESPACE Qt3D) -set(QMesh_NAMESPACE Qt3D) +set(QAspectEngine_NAMESPACE Qt3DCore) +set(QMesh_NAMESPACE Qt3DRender) test_module_includes( 3DCore QAspectEngine - 3DRenderer QMesh + 3DRender QMesh ) diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro index 9be7e3797..8eca7b7ff 100644 --- a/tests/auto/cmake/cmake.pro +++ b/tests/auto/cmake/cmake.pro @@ -2,6 +2,6 @@ # Cause make to do nothing. TEMPLATE = subdirs -CMAKE_QT_MODULES_UNDER_TEST = 3dcore 3drenderer +CMAKE_QT_MODULES_UNDER_TEST = 3dcore 3drender CONFIG += ctest_testcase diff --git a/tests/auto/render/attribute/attribute.pro b/tests/auto/render/attribute/attribute.pro index 1786b49b0..259053efa 100644 --- a/tests/auto/render/attribute/attribute.pro +++ b/tests/auto/render/attribute/attribute.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_attribute -QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/attribute/tst_attribute.cpp b/tests/auto/render/attribute/tst_attribute.cpp index eeeca88f6..6d09414e9 100644 --- a/tests/auto/render/attribute/tst_attribute.cpp +++ b/tests/auto/render/attribute/tst_attribute.cpp @@ -35,8 +35,8 @@ ****************************************************************************/ #include <QtTest/QTest> -#include <Qt3DRenderer/private/attribute_p.h> -#include <Qt3DRenderer/qbuffer.h> +#include <Qt3DRender/private/attribute_p.h> +#include <Qt3DRender/qbuffer.h> #include <Qt3DCore/qscenepropertychange.h> class tst_Attribute : public QObject diff --git a/tests/auto/render/buffer/buffer.pro b/tests/auto/render/buffer/buffer.pro index 5e6dcfcf2..73c13dd42 100644 --- a/tests/auto/render/buffer/buffer.pro +++ b/tests/auto/render/buffer/buffer.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_buffer -QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/buffer/tst_buffer.cpp b/tests/auto/render/buffer/tst_buffer.cpp index e2bb93b29..a367d0929 100644 --- a/tests/auto/render/buffer/tst_buffer.cpp +++ b/tests/auto/render/buffer/tst_buffer.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include <QtTest/QTest> -#include <Qt3DRenderer/private/buffer_p.h> +#include <Qt3DRender/private/buffer_p.h> #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DCore/private/qbackendnode_p.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/entity/entity.pro b/tests/auto/render/entity/entity.pro index c14c9edfa..be8998802 100644 --- a/tests/auto/render/entity/entity.pro +++ b/tests/auto/render/entity/entity.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_entity -QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/entity/tst_entity.cpp b/tests/auto/render/entity/tst_entity.cpp index 1f3f1d390..ea3dcbbeb 100644 --- a/tests/auto/render/entity/tst_entity.cpp +++ b/tests/auto/render/entity/tst_entity.cpp @@ -35,17 +35,17 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <Qt3DRenderer/private/entity_p.h> +#include <Qt3DRender/private/entity_p.h> #include <Qt3DCore/QCameraLens> #include <Qt3DCore/QScenePropertyChange> #include <Qt3DCore/QTransform> -#include <Qt3DRenderer/QMesh> -#include <Qt3DRenderer/QMaterial> -#include <Qt3DRenderer/QLayer> -#include <Qt3DRenderer/QShaderData> -#include <Qt3DRenderer/QGeometryRenderer> +#include <Qt3DRender/QMesh> +#include <Qt3DRender/QMaterial> +#include <Qt3DRender/QLayer> +#include <Qt3DRender/QShaderData> +#include <Qt3DRender/QGeometryRenderer> typedef Qt3DCore::QNodeId (*UuidMethod)(Qt3DRender::Render::Entity *); typedef QList<Qt3DCore::QNodeId> (*UuidListMethod)(Qt3DRender::Render::Entity *); diff --git a/tests/auto/render/framegraphnode/framegraphnode.pro b/tests/auto/render/framegraphnode/framegraphnode.pro index 478e74c02..577bc9775 100644 --- a/tests/auto/render/framegraphnode/framegraphnode.pro +++ b/tests/auto/render/framegraphnode/framegraphnode.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = tst_framegraphnode -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/framegraphnode/tst_framegraphnode.cpp b/tests/auto/render/framegraphnode/tst_framegraphnode.cpp index cfc85fa5b..0e606dff9 100644 --- a/tests/auto/render/framegraphnode/tst_framegraphnode.cpp +++ b/tests/auto/render/framegraphnode/tst_framegraphnode.cpp @@ -35,8 +35,8 @@ ****************************************************************************/ #include <QtTest/QTest> -#include <Qt3DRenderer/private/framegraphnode_p.h> -#include <Qt3DRenderer/private/managers_p.h> +#include <Qt3DRender/private/framegraphnode_p.h> +#include <Qt3DRender/private/managers_p.h> class MyFrameGraphNode : public Qt3DRender::Render::FrameGraphNode { diff --git a/tests/auto/render/geometry/geometry.pro b/tests/auto/render/geometry/geometry.pro index 9d4edb51e..fc916fc7a 100644 --- a/tests/auto/render/geometry/geometry.pro +++ b/tests/auto/render/geometry/geometry.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_geometry -QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/geometry/tst_geometry.cpp b/tests/auto/render/geometry/tst_geometry.cpp index 2fa9a4377..1ff1a2ba5 100644 --- a/tests/auto/render/geometry/tst_geometry.cpp +++ b/tests/auto/render/geometry/tst_geometry.cpp @@ -35,9 +35,9 @@ ****************************************************************************/ #include <QtTest/QTest> -#include <Qt3DRenderer/private/geometry_p.h> -#include <Qt3DRenderer/qgeometry.h> -#include <Qt3DRenderer/qattribute.h> +#include <Qt3DRender/private/geometry_p.h> +#include <Qt3DRender/qgeometry.h> +#include <Qt3DRender/qattribute.h> #include <Qt3DCore/qscenepropertychange.h> class tst_RenderGeometry : public QObject diff --git a/tests/auto/render/geometryrenderer/geometryrenderer.pro b/tests/auto/render/geometryrenderer/geometryrenderer.pro index 63ad16592..7499730f9 100644 --- a/tests/auto/render/geometryrenderer/geometryrenderer.pro +++ b/tests/auto/render/geometryrenderer/geometryrenderer.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_geometryrenderer -QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp index 7602452d5..c9bdebb34 100644 --- a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp +++ b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp @@ -35,9 +35,9 @@ ****************************************************************************/ #include <QtTest/QTest> -#include <Qt3DRenderer/private/geometryrenderer_p.h> -#include <Qt3DRenderer/qgeometry.h> -#include <Qt3DRenderer/qgeometryfunctor.h> +#include <Qt3DRender/private/geometryrenderer_p.h> +#include <Qt3DRender/qgeometry.h> +#include <Qt3DRender/qgeometryfunctor.h> #include <Qt3DCore/qscenepropertychange.h> class TestFunctor : public Qt3DRender::QGeometryFunctor diff --git a/tests/auto/render/material/material.pro b/tests/auto/render/material/material.pro index 051b8f3e0..b848ec0ec 100644 --- a/tests/auto/render/material/material.pro +++ b/tests/auto/render/material/material.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_material -QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/material/tst_material.cpp b/tests/auto/render/material/tst_material.cpp index 48733d03b..7f104347d 100644 --- a/tests/auto/render/material/tst_material.cpp +++ b/tests/auto/render/material/tst_material.cpp @@ -35,11 +35,11 @@ ****************************************************************************/ #include <QtTest/QTest> -#include <Qt3DRenderer/private/material_p.h> +#include <Qt3DRender/private/material_p.h> -#include <Qt3DRenderer/QMaterial> -#include <Qt3DRenderer/QParameter> -#include <Qt3DRenderer/QEffect> +#include <Qt3DRender/QMaterial> +#include <Qt3DRender/QParameter> +#include <Qt3DRender/QEffect> #include <Qt3DCore/QScenePropertyChange> diff --git a/tests/auto/render/meshfunctors/meshfunctors.pro b/tests/auto/render/meshfunctors/meshfunctors.pro index 008969cd0..cdf7d5e9b 100644 --- a/tests/auto/render/meshfunctors/meshfunctors.pro +++ b/tests/auto/render/meshfunctors/meshfunctors.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_renderviews -QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/meshfunctors/tst_meshfunctors.cpp b/tests/auto/render/meshfunctors/tst_meshfunctors.cpp index 36a0f7316..3b4f587a5 100644 --- a/tests/auto/render/meshfunctors/tst_meshfunctors.cpp +++ b/tests/auto/render/meshfunctors/tst_meshfunctors.cpp @@ -35,8 +35,8 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <Qt3DRenderer/qgeometryfunctor.h> -#include <Qt3DRenderer/qgeometry.h> +#include <Qt3DRender/qgeometryfunctor.h> +#include <Qt3DRender/qgeometry.h> class MeshFunctorA : public Qt3DRender::QGeometryFunctor { diff --git a/tests/auto/render/qattribute/qattribute.pro b/tests/auto/render/qattribute/qattribute.pro index 474531bf3..50acb9ded 100644 --- a/tests/auto/render/qattribute/qattribute.pro +++ b/tests/auto/render/qattribute/qattribute.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_qattribute -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qattribute/tst_qattribute.cpp b/tests/auto/render/qattribute/tst_qattribute.cpp index de73fa016..1880e5091 100644 --- a/tests/auto/render/qattribute/tst_qattribute.cpp +++ b/tests/auto/render/qattribute/tst_qattribute.cpp @@ -38,8 +38,8 @@ #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DRenderer/QAttribute> -#include <Qt3DRenderer/QBuffer> +#include <Qt3DRender/QAttribute> +#include <Qt3DRender/QBuffer> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qbuffer/qbuffer.pro b/tests/auto/render/qbuffer/qbuffer.pro index 69f30d1f8..7b3e4315e 100644 --- a/tests/auto/render/qbuffer/qbuffer.pro +++ b/tests/auto/render/qbuffer/qbuffer.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_qbuffer -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qbuffer/tst_qbuffer.cpp b/tests/auto/render/qbuffer/tst_qbuffer.cpp index 5711d9547..6d9649a42 100644 --- a/tests/auto/render/qbuffer/tst_qbuffer.cpp +++ b/tests/auto/render/qbuffer/tst_qbuffer.cpp @@ -38,8 +38,8 @@ #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DRenderer/qbuffer.h> -#include <Qt3DRenderer/qbufferfunctor.h> +#include <Qt3DRender/qbuffer.h> +#include <Qt3DRender/qbufferfunctor.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qcameraselector/qcameraselector.pro b/tests/auto/render/qcameraselector/qcameraselector.pro index 87cb30636..79f8f660e 100644 --- a/tests/auto/render/qcameraselector/qcameraselector.pro +++ b/tests/auto/render/qcameraselector/qcameraselector.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_qcameraselector -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qcameraselector/tst_qcameraselector.cpp b/tests/auto/render/qcameraselector/tst_qcameraselector.cpp index f336ab890..96faf4e18 100644 --- a/tests/auto/render/qcameraselector/tst_qcameraselector.cpp +++ b/tests/auto/render/qcameraselector/tst_qcameraselector.cpp @@ -38,7 +38,7 @@ #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DRenderer/qcameraselector.h> +#include <Qt3DRender/qcameraselector.h> #include <Qt3DCore/qentity.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qclearbuffer/qclearbuffer.pro b/tests/auto/render/qclearbuffer/qclearbuffer.pro index 0e33f3a32..e85e481f3 100644 --- a/tests/auto/render/qclearbuffer/qclearbuffer.pro +++ b/tests/auto/render/qclearbuffer/qclearbuffer.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_qclearbuffer -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qclearbuffer/tst_qclearbuffer.cpp b/tests/auto/render/qclearbuffer/tst_qclearbuffer.cpp index 1e8876b9c..23fec8cff 100644 --- a/tests/auto/render/qclearbuffer/tst_qclearbuffer.cpp +++ b/tests/auto/render/qclearbuffer/tst_qclearbuffer.cpp @@ -38,7 +38,7 @@ #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DRenderer/qclearbuffer.h> +#include <Qt3DRender/qclearbuffer.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qframegraph/qframegraph.pro b/tests/auto/render/qframegraph/qframegraph.pro index 3e89d8cd1..4f782fcd1 100644 --- a/tests/auto/render/qframegraph/qframegraph.pro +++ b/tests/auto/render/qframegraph/qframegraph.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = tst_qframegraph -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qframegraph/tst_qframegraph.cpp b/tests/auto/render/qframegraph/tst_qframegraph.cpp index ce6ed338c..f3dfe7ca9 100644 --- a/tests/auto/render/qframegraph/tst_qframegraph.cpp +++ b/tests/auto/render/qframegraph/tst_qframegraph.cpp @@ -39,8 +39,8 @@ #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qentity.h> -#include <Qt3DRenderer/qframegraphnode.h> -#include <Qt3DRenderer/qframegraph.h> +#include <Qt3DRender/qframegraphnode.h> +#include <Qt3DRender/qframegraph.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qframegraphnode/qframegraphnode.pro b/tests/auto/render/qframegraphnode/qframegraphnode.pro index 7f306d19c..0cfce4e68 100644 --- a/tests/auto/render/qframegraphnode/qframegraphnode.pro +++ b/tests/auto/render/qframegraphnode/qframegraphnode.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = tst_qframegraphnode -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qframegraphnode/tst_qframegraphnode.cpp b/tests/auto/render/qframegraphnode/tst_qframegraphnode.cpp index f0705a479..93805eab4 100644 --- a/tests/auto/render/qframegraphnode/tst_qframegraphnode.cpp +++ b/tests/auto/render/qframegraphnode/tst_qframegraphnode.cpp @@ -39,7 +39,7 @@ #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qentity.h> -#include <Qt3DRenderer/qframegraphnode.h> +#include <Qt3DRender/qframegraphnode.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qgeometry/qgeometry.pro b/tests/auto/render/qgeometry/qgeometry.pro index 9ab76b6cc..45b86a089 100644 --- a/tests/auto/render/qgeometry/qgeometry.pro +++ b/tests/auto/render/qgeometry/qgeometry.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_qgeometry -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qgeometry/tst_qgeometry.cpp b/tests/auto/render/qgeometry/tst_qgeometry.cpp index 08a1429db..a9e09ae30 100644 --- a/tests/auto/render/qgeometry/tst_qgeometry.cpp +++ b/tests/auto/render/qgeometry/tst_qgeometry.cpp @@ -38,9 +38,9 @@ #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DRenderer/qgeometry.h> -#include <Qt3DRenderer/qattribute.h> -#include <Qt3DRenderer/qbuffer.h> +#include <Qt3DRender/qgeometry.h> +#include <Qt3DRender/qattribute.h> +#include <Qt3DRender/qbuffer.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qgeometryrenderer/qgeometryrenderer.pro b/tests/auto/render/qgeometryrenderer/qgeometryrenderer.pro index 668fa6550..8d0a700d7 100644 --- a/tests/auto/render/qgeometryrenderer/qgeometryrenderer.pro +++ b/tests/auto/render/qgeometryrenderer/qgeometryrenderer.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_qgeometryrenderer -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp index 0eb3e1248..093491a43 100644 --- a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp +++ b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp @@ -38,11 +38,11 @@ #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DRenderer/qgeometryrenderer.h> -#include <Qt3DRenderer/qgeometryfunctor.h> -#include <Qt3DRenderer/qgeometry.h> -#include <Qt3DRenderer/qattribute.h> -#include <Qt3DRenderer/qbuffer.h> +#include <Qt3DRender/qgeometryrenderer.h> +#include <Qt3DRender/qgeometryfunctor.h> +#include <Qt3DRender/qgeometry.h> +#include <Qt3DRender/qattribute.h> +#include <Qt3DRender/qbuffer.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qgraphicsutils/qgraphicsutils.pro b/tests/auto/render/qgraphicsutils/qgraphicsutils.pro index 6ab00ad6a..031a26246 100644 --- a/tests/auto/render/qgraphicsutils/qgraphicsutils.pro +++ b/tests/auto/render/qgraphicsutils/qgraphicsutils.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_qgraphicsutils -QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qlayerfilter/qlayerfilter.pro b/tests/auto/render/qlayerfilter/qlayerfilter.pro index ac115a556..44dfdd08e 100644 --- a/tests/auto/render/qlayerfilter/qlayerfilter.pro +++ b/tests/auto/render/qlayerfilter/qlayerfilter.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_qlayerfilter -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp b/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp index ed8e9ab30..97581c875 100644 --- a/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp +++ b/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp @@ -38,7 +38,7 @@ #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DRenderer/qlayerfilter.h> +#include <Qt3DRender/qlayerfilter.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qmaterial/qmaterial.pro b/tests/auto/render/qmaterial/qmaterial.pro index 75e5e93a9..a9a27b4bf 100644 --- a/tests/auto/render/qmaterial/qmaterial.pro +++ b/tests/auto/render/qmaterial/qmaterial.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_qmaterial -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qmaterial/tst_qmaterial.cpp b/tests/auto/render/qmaterial/tst_qmaterial.cpp index 3edeb33e1..fc3396d03 100644 --- a/tests/auto/render/qmaterial/tst_qmaterial.cpp +++ b/tests/auto/render/qmaterial/tst_qmaterial.cpp @@ -38,19 +38,19 @@ #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DRenderer/QEffect> -#include <Qt3DRenderer/QMaterial> -#include <Qt3DRenderer/QParameter> -#include <Qt3DRenderer/QTechnique> -#include <Qt3DRenderer/QRenderPass> -#include <Qt3DRenderer/QPhongMaterial> -#include <Qt3DRenderer/QParameterMapping> -#include <Qt3DRenderer/QDiffuseMapMaterial> -#include <Qt3DRenderer/QPerVertexColorMaterial> -#include <Qt3DRenderer/QNormalDiffuseMapMaterial> -#include <Qt3DRenderer/QDiffuseSpecularMapMaterial> -#include <Qt3DRenderer/QNormalDiffuseMapAlphaMaterial> -#include <Qt3DRenderer/QNormalDiffuseSpecularMapMaterial> +#include <Qt3DRender/QEffect> +#include <Qt3DRender/QMaterial> +#include <Qt3DRender/QParameter> +#include <Qt3DRender/QTechnique> +#include <Qt3DRender/QRenderPass> +#include <Qt3DRender/QPhongMaterial> +#include <Qt3DRender/QParameterMapping> +#include <Qt3DRender/QDiffuseMapMaterial> +#include <Qt3DRender/QPerVertexColorMaterial> +#include <Qt3DRender/QNormalDiffuseMapMaterial> +#include <Qt3DRender/QDiffuseSpecularMapMaterial> +#include <Qt3DRender/QNormalDiffuseMapAlphaMaterial> +#include <Qt3DRender/QNormalDiffuseSpecularMapMaterial> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qrenderpassfilter/qrenderpassfilter.pro b/tests/auto/render/qrenderpassfilter/qrenderpassfilter.pro index f69ed7202..0769b3fe5 100644 --- a/tests/auto/render/qrenderpassfilter/qrenderpassfilter.pro +++ b/tests/auto/render/qrenderpassfilter/qrenderpassfilter.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = tst_qrenderpassfilter -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp b/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp index a8e3f943f..43bdb2e0a 100644 --- a/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp +++ b/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp @@ -39,9 +39,9 @@ #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qentity.h> -#include <Qt3DRenderer/qrenderpassfilter.h> -#include <Qt3DRenderer/qparameter.h> -#include <Qt3DRenderer/qannotation.h> +#include <Qt3DRender/qrenderpassfilter.h> +#include <Qt3DRender/qparameter.h> +#include <Qt3DRender/qannotation.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qrendertargetselector/qrendertargetselector.pro b/tests/auto/render/qrendertargetselector/qrendertargetselector.pro index e5939d54f..8f4c110df 100644 --- a/tests/auto/render/qrendertargetselector/qrendertargetselector.pro +++ b/tests/auto/render/qrendertargetselector/qrendertargetselector.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = tst_qrendertargetselector -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp b/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp index aa4aac5f1..2b3088562 100644 --- a/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp +++ b/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp @@ -39,8 +39,8 @@ #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qentity.h> -#include <Qt3DRenderer/qrendertargetselector.h> -#include <Qt3DRenderer/qrendertarget.h> +#include <Qt3DRender/qrendertargetselector.h> +#include <Qt3DRender/qrendertarget.h> #include "testpostmanarbiter.h" // We need to call QNode::clone which is protected diff --git a/tests/auto/render/qsortcriterion/qsortcriterion.pro b/tests/auto/render/qsortcriterion/qsortcriterion.pro index 1a7b34239..f612fcd5a 100644 --- a/tests/auto/render/qsortcriterion/qsortcriterion.pro +++ b/tests/auto/render/qsortcriterion/qsortcriterion.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_qsortcriterion -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qsortcriterion/tst_qsortcriterion.cpp b/tests/auto/render/qsortcriterion/tst_qsortcriterion.cpp index fd53bed2e..fe835b97e 100644 --- a/tests/auto/render/qsortcriterion/tst_qsortcriterion.cpp +++ b/tests/auto/render/qsortcriterion/tst_qsortcriterion.cpp @@ -38,7 +38,7 @@ #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DRenderer/qsortcriterion.h> +#include <Qt3DRender/qsortcriterion.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qsortmethod/qsortmethod.pro b/tests/auto/render/qsortmethod/qsortmethod.pro index 64d7ea4b8..ca9537aa6 100644 --- a/tests/auto/render/qsortmethod/qsortmethod.pro +++ b/tests/auto/render/qsortmethod/qsortmethod.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = tst_qsortmethod -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qsortmethod/tst_qsortmethod.cpp b/tests/auto/render/qsortmethod/tst_qsortmethod.cpp index 718d0855e..035291375 100644 --- a/tests/auto/render/qsortmethod/tst_qsortmethod.cpp +++ b/tests/auto/render/qsortmethod/tst_qsortmethod.cpp @@ -39,8 +39,8 @@ #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qentity.h> -#include <Qt3DRenderer/qsortmethod.h> -#include <Qt3DRenderer/qsortcriterion.h> +#include <Qt3DRender/qsortmethod.h> +#include <Qt3DRender/qsortcriterion.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qstateset/qstateset.pro b/tests/auto/render/qstateset/qstateset.pro index ca622c9db..ab96eb8f7 100644 --- a/tests/auto/render/qstateset/qstateset.pro +++ b/tests/auto/render/qstateset/qstateset.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = tst_qstateset -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qstateset/tst_qstateset.cpp b/tests/auto/render/qstateset/tst_qstateset.cpp index f6e1655c8..f28b772d0 100644 --- a/tests/auto/render/qstateset/tst_qstateset.cpp +++ b/tests/auto/render/qstateset/tst_qstateset.cpp @@ -39,9 +39,9 @@ #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qentity.h> -#include <Qt3DRenderer/qstateset.h> -#include <Qt3DRenderer/private/qrenderstate_p.h> -#include <Qt3DRenderer/qrenderstate.h> +#include <Qt3DRender/qstateset.h> +#include <Qt3DRender/private/qrenderstate_p.h> +#include <Qt3DRender/qrenderstate.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qtechniquefilter/qtechniquefilter.pro b/tests/auto/render/qtechniquefilter/qtechniquefilter.pro index d36d6069b..772176823 100644 --- a/tests/auto/render/qtechniquefilter/qtechniquefilter.pro +++ b/tests/auto/render/qtechniquefilter/qtechniquefilter.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = tst_qtechniquefilter -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp b/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp index 71a0ecac1..dfe101009 100644 --- a/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp +++ b/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp @@ -39,9 +39,9 @@ #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qentity.h> -#include <Qt3DRenderer/qtechniquefilter.h> -#include <Qt3DRenderer/qparameter.h> -#include <Qt3DRenderer/qannotation.h> +#include <Qt3DRender/qtechniquefilter.h> +#include <Qt3DRender/qparameter.h> +#include <Qt3DRender/qannotation.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/qviewport/qviewport.pro b/tests/auto/render/qviewport/qviewport.pro index 49b3ffb84..3f0a2f070 100644 --- a/tests/auto/render/qviewport/qviewport.pro +++ b/tests/auto/render/qviewport/qviewport.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_qviewport -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/qviewport/tst_qviewport.cpp b/tests/auto/render/qviewport/tst_qviewport.cpp index 1d03ce67c..019e43a9b 100644 --- a/tests/auto/render/qviewport/tst_qviewport.cpp +++ b/tests/auto/render/qviewport/tst_qviewport.cpp @@ -38,7 +38,7 @@ #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DRenderer/qviewport.h> +#include <Qt3DRender/qviewport.h> #include "testpostmanarbiter.h" diff --git a/tests/auto/render/raycasting/raycasting.pro b/tests/auto/render/raycasting/raycasting.pro index e389ef3d7..9eb5db48f 100644 --- a/tests/auto/render/raycasting/raycasting.pro +++ b/tests/auto/render/raycasting/raycasting.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_raycasting -QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/raycasting/tst_raycasting.cpp b/tests/auto/render/raycasting/tst_raycasting.cpp index 2aaa92984..fed440f62 100644 --- a/tests/auto/render/raycasting/tst_raycasting.cpp +++ b/tests/auto/render/raycasting/tst_raycasting.cpp @@ -35,9 +35,9 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <Qt3DRenderer/private/entity_p.h> -#include <Qt3DRenderer/qraycastingservice.h> -#include <Qt3DRenderer/sphere.h> +#include <Qt3DRender/private/entity_p.h> +#include <Qt3DRender/qraycastingservice.h> +#include <Qt3DRender/sphere.h> #include <Qt3DCore/qboundingvolumeprovider.h> #include <Qt3DCore/qray3d.h> diff --git a/tests/auto/render/renderpass/renderpass.pro b/tests/auto/render/renderpass/renderpass.pro index ab0fe4211..2b7806af1 100644 --- a/tests/auto/render/renderpass/renderpass.pro +++ b/tests/auto/render/renderpass/renderpass.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_renderpass -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/renderpass/tst_renderpass.cpp b/tests/auto/render/renderpass/tst_renderpass.cpp index a5b66a534..56123ad25 100644 --- a/tests/auto/render/renderpass/tst_renderpass.cpp +++ b/tests/auto/render/renderpass/tst_renderpass.cpp @@ -35,36 +35,36 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <Qt3DRenderer/private/renderpass_p.h> +#include <Qt3DRender/private/renderpass_p.h> #include <Qt3DCore/QScenePropertyChange> -#include <Qt3DRenderer/QAnnotation> -#include <Qt3DRenderer/QParameterMapping> -#include <Qt3DRenderer/QRenderPass> -#include <Qt3DRenderer/QShaderProgram> -#include <Qt3DRenderer/QParameter> - -#include <Qt3DRenderer/QAlphaCoverage> -#include <Qt3DRenderer/QAlphaTest> -#include <Qt3DRenderer/QBlendEquation> -#include <Qt3DRenderer/QBlendState> -#include <Qt3DRenderer/QColorMask> -#include <Qt3DRenderer/QCullFace> -#include <Qt3DRenderer/QDepthMask> -#include <Qt3DRenderer/QDepthTest> -#include <Qt3DRenderer/QDithering> -#include <Qt3DRenderer/QFrontFace> -#include <Qt3DRenderer/QPolygonOffset> -#include <Qt3DRenderer/QScissorTest> -#include <Qt3DRenderer/QStencilTest> -#include <Qt3DRenderer/QStencilTestSeparate> -#include <Qt3DRenderer/QStencilMask> -#include <Qt3DRenderer/QStencilOp> -#include <Qt3DRenderer/QStencilOpSeparate> -#include <Qt3DRenderer/QClipPlane> - -#include <Qt3DRenderer/private/renderstates_p.h> +#include <Qt3DRender/QAnnotation> +#include <Qt3DRender/QParameterMapping> +#include <Qt3DRender/QRenderPass> +#include <Qt3DRender/QShaderProgram> +#include <Qt3DRender/QParameter> + +#include <Qt3DRender/QAlphaCoverage> +#include <Qt3DRender/QAlphaTest> +#include <Qt3DRender/QBlendEquation> +#include <Qt3DRender/QBlendState> +#include <Qt3DRender/QColorMask> +#include <Qt3DRender/QCullFace> +#include <Qt3DRender/QDepthMask> +#include <Qt3DRender/QDepthTest> +#include <Qt3DRender/QDithering> +#include <Qt3DRender/QFrontFace> +#include <Qt3DRender/QPolygonOffset> +#include <Qt3DRender/QScissorTest> +#include <Qt3DRender/QStencilTest> +#include <Qt3DRender/QStencilTestSeparate> +#include <Qt3DRender/QStencilMask> +#include <Qt3DRender/QStencilOp> +#include <Qt3DRender/QStencilOpSeparate> +#include <Qt3DRender/QClipPlane> + +#include <Qt3DRender/private/renderstates_p.h> using namespace Qt3DCore; using namespace Qt3DRender; diff --git a/tests/auto/render/renderqueue/renderqueue.pro b/tests/auto/render/renderqueue/renderqueue.pro index 85ed34db4..92e675285 100644 --- a/tests/auto/render/renderqueue/renderqueue.pro +++ b/tests/auto/render/renderqueue/renderqueue.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_renderqueue -QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/renderqueue/tst_renderqueue.cpp b/tests/auto/render/renderqueue/tst_renderqueue.cpp index 2fb01554b..c571de2c0 100644 --- a/tests/auto/render/renderqueue/tst_renderqueue.cpp +++ b/tests/auto/render/renderqueue/tst_renderqueue.cpp @@ -38,8 +38,8 @@ #include <QMutex> #include <QWaitCondition> #include <QThread> -#include <Qt3DRenderer/private/renderqueue_p.h> -#include <Qt3DRenderer/private/renderview_p.h> +#include <Qt3DRender/private/renderqueue_p.h> +#include <Qt3DRender/private/renderview_p.h> class tst_RenderQueue : public QObject { diff --git a/tests/auto/render/renderviews/renderviews.pro b/tests/auto/render/renderviews/renderviews.pro index 93bcf7e8c..8a46b90df 100644 --- a/tests/auto/render/renderviews/renderviews.pro +++ b/tests/auto/render/renderviews/renderviews.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_renderviews -QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/renderviewutils/renderviewutils.pro b/tests/auto/render/renderviewutils/renderviewutils.pro index 1ce0affec..c45313023 100644 --- a/tests/auto/render/renderviewutils/renderviewutils.pro +++ b/tests/auto/render/renderviewutils/renderviewutils.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_renderviewutils -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/renderviewutils/tst_renderviewutils.cpp b/tests/auto/render/renderviewutils/tst_renderviewutils.cpp index ca02b3166..1cab4da2e 100644 --- a/tests/auto/render/renderviewutils/tst_renderviewutils.cpp +++ b/tests/auto/render/renderviewutils/tst_renderviewutils.cpp @@ -36,10 +36,10 @@ #include <QtTest/QTest> -#include <Qt3DRenderer/private/renderviewjobutils_p.h> -#include <Qt3DRenderer/private/shaderdata_p.h> -#include <Qt3DRenderer/private/managers_p.h> -#include <Qt3DRenderer/qshaderdata.h> +#include <Qt3DRender/private/renderviewjobutils_p.h> +#include <Qt3DRender/private/shaderdata_p.h> +#include <Qt3DRender/private/managers_p.h> +#include <Qt3DRender/qshaderdata.h> class tst_RenderViewUtils : public QObject diff --git a/tests/auto/render/shader/shader.pro b/tests/auto/render/shader/shader.pro index ba942083a..8d0dd99a5 100644 --- a/tests/auto/render/shader/shader.pro +++ b/tests/auto/render/shader/shader.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_shader -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase diff --git a/tests/auto/render/shader/tst_shader.cpp b/tests/auto/render/shader/tst_shader.cpp index 6a8a61f58..ae850ddc3 100644 --- a/tests/auto/render/shader/tst_shader.cpp +++ b/tests/auto/render/shader/tst_shader.cpp @@ -35,8 +35,8 @@ ****************************************************************************/ #include <QtTest/QTest> -#include <Qt3DRenderer/private/shader_p.h> -#include <Qt3DRenderer/qshaderprogram.h> +#include <Qt3DRender/private/shader_p.h> +#include <Qt3DRender/qshaderprogram.h> class tst_RenderShader : public QObject { diff --git a/tests/auto/render/vsyncframeadvanceservice/tst_vsyncframeadvanceservice.cpp b/tests/auto/render/vsyncframeadvanceservice/tst_vsyncframeadvanceservice.cpp index 48bfef9f3..bfa394a25 100644 --- a/tests/auto/render/vsyncframeadvanceservice/tst_vsyncframeadvanceservice.cpp +++ b/tests/auto/render/vsyncframeadvanceservice/tst_vsyncframeadvanceservice.cpp @@ -36,7 +36,7 @@ #include <QtTest/QtTest> -#include <Qt3DRenderer/private/vsyncframeadvanceservice_p.h> +#include <Qt3DRender/private/vsyncframeadvanceservice_p.h> class FakeRenderThread Q_DECL_FINAL : public QThread { diff --git a/tests/auto/render/vsyncframeadvanceservice/vsyncframeadvanceservice.pro b/tests/auto/render/vsyncframeadvanceservice/vsyncframeadvanceservice.pro index 25d8a70e5..4d6b336d1 100644 --- a/tests/auto/render/vsyncframeadvanceservice/vsyncframeadvanceservice.pro +++ b/tests/auto/render/vsyncframeadvanceservice/vsyncframeadvanceservice.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_vsyncframeadvanceservice -QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib +QT += 3dcore 3dcore-private 3drender 3drender-private testlib CONFIG += testcase |