diff options
34 files changed, 36 insertions, 36 deletions
diff --git a/src/plugins/sceneparsers/assimp/assimpparser.cpp b/src/plugins/sceneparsers/assimp/assimpparser.cpp index 8566898aa..746cf1ae7 100644 --- a/src/plugins/sceneparsers/assimp/assimpparser.cpp +++ b/src/plugins/sceneparsers/assimp/assimpparser.cpp @@ -55,7 +55,7 @@ #include <QFileInfo> #include <QColor> #include <qmath.h> -#include "renderlogging.h" +#include <Qt3DRenderer/private/renderlogging_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/framegraph/cameraselectornode.cpp b/src/render/backend/framegraph/cameraselectornode.cpp index b10acbf20..b63533eb9 100644 --- a/src/render/backend/framegraph/cameraselectornode.cpp +++ b/src/render/backend/framegraph/cameraselectornode.cpp @@ -46,7 +46,7 @@ #include <Qt3DCore/private/qchangearbiter_p.h> #include <Qt3DCore/qentity.h> #include <Qt3DCore/qscenepropertychange.h> -#include "renderlogging.h" +#include <Qt3DRenderer/private/renderlogging_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/framegraph/rendertargetselectornode.cpp b/src/render/backend/framegraph/rendertargetselectornode.cpp index 88b7c4a7b..963c49ba7 100644 --- a/src/render/backend/framegraph/rendertargetselectornode.cpp +++ b/src/render/backend/framegraph/rendertargetselectornode.cpp @@ -46,7 +46,7 @@ #include <Qt3DRenderer/qrendertargetselector.h> #include <Qt3DRenderer/qrendertarget.h> #include <Qt3DCore/qscenepropertychange.h> -#include "renderlogging.h" +#include <Qt3DRenderer/private/renderlogging_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/jobs/loadmeshdatajob.cpp b/src/render/backend/jobs/loadmeshdatajob.cpp index 49c0c990c..0e79c2d90 100644 --- a/src/render/backend/jobs/loadmeshdatajob.cpp +++ b/src/render/backend/jobs/loadmeshdatajob.cpp @@ -47,9 +47,9 @@ #include <Qt3DRenderer/private/renderer_p.h> #include <Qt3DRenderer/private/managers_p.h> #include <Qt3DRenderer/private/meshdatamanager_p.h> +#include <Qt3DRenderer/private/renderlogging_p.h> #include <QThread> -#include "renderlogging.h" QT_BEGIN_NAMESPACE diff --git a/src/render/backend/jobs/renderviewjob.cpp b/src/render/backend/jobs/renderviewjob.cpp index 2bba75dd5..edd934c39 100644 --- a/src/render/backend/jobs/renderviewjob.cpp +++ b/src/render/backend/jobs/renderviewjob.cpp @@ -44,8 +44,8 @@ #include <Qt3DRenderer/private/renderview_p.h> #include <Qt3DRenderer/private/renderer_p.h> #include <Qt3DRenderer/private/renderviewjobutils_p.h> +#include <Qt3DRenderer/private/renderlogging_p.h> -#include "renderlogging.h" QT_BEGIN_NAMESPACE diff --git a/src/render/backend/jobs/updateboundingvolumejob.cpp b/src/render/backend/jobs/updateboundingvolumejob.cpp index 6ce3b953d..c4a8fb937 100644 --- a/src/render/backend/jobs/updateboundingvolumejob.cpp +++ b/src/render/backend/jobs/updateboundingvolumejob.cpp @@ -43,9 +43,9 @@ #include <Qt3DRenderer/private/renderer_p.h> #include <Qt3DRenderer/private/renderentity_p.h> +#include <Qt3DRenderer/private/renderlogging_p.h> #include <sphere.h> -#include "renderlogging.h" #include <QElapsedTimer> #include <QStack> #include <QThread> diff --git a/src/render/backend/jobs/updateworldtransformjob.cpp b/src/render/backend/jobs/updateworldtransformjob.cpp index e8900b6cf..2dae2f1c9 100644 --- a/src/render/backend/jobs/updateworldtransformjob.cpp +++ b/src/render/backend/jobs/updateworldtransformjob.cpp @@ -45,7 +45,7 @@ #include <Qt3DRenderer/private/renderentity_p.h> #include <sphere.h> #include <Qt3DRenderer/private/rendertransform_p.h> -#include "renderlogging.h" +#include <Qt3DRenderer/private/renderlogging_p.h> #include <QThread> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/qgraphicscontext.cpp b/src/render/backend/qgraphicscontext.cpp index 707ad20c1..59160f89e 100644 --- a/src/render/backend/qgraphicscontext.cpp +++ b/src/render/backend/qgraphicscontext.cpp @@ -44,7 +44,7 @@ #include <Qt3DRenderer/qopenglfilter.h> #include <Qt3DRenderer/qparameter.h> -#include <Qt3DRenderer/renderlogging.h> +#include <Qt3DRenderer/private/renderlogging_p.h> #include <Qt3DRenderer/private/rendershader_p.h> #include <Qt3DRenderer/private/rendermaterial_p.h> #include <Qt3DRenderer/private/rendertexture_p.h> diff --git a/src/render/backend/qgraphicshelperes2.cpp b/src/render/backend/qgraphicshelperes2.cpp index 3cbd37399..793a655be 100644 --- a/src/render/backend/qgraphicshelperes2.cpp +++ b/src/render/backend/qgraphicshelperes2.cpp @@ -41,7 +41,7 @@ #include "qgraphicshelperes2_p.h" #include "qopenglfunctions_es2.h" -#include "renderlogging.h" +#include <Qt3DRenderer/private/renderlogging_p.h> #include <private/attachmentpack_p.h> #include <private/qgraphicsutils_p.h> diff --git a/src/render/backend/qgraphicshelpergl3.cpp b/src/render/backend/qgraphicshelpergl3.cpp index 7c722ece0..49aebe86a 100644 --- a/src/render/backend/qgraphicshelpergl3.cpp +++ b/src/render/backend/qgraphicshelpergl3.cpp @@ -44,7 +44,7 @@ #include "qgraphicshelpergl3_p.h" #include <QOpenGLFunctions_3_2_Core> #include <QtOpenGLExtensions/qopenglextensions.h> -#include "renderlogging.h" +#include <Qt3DRenderer/private/renderlogging_p.h> #include <private/attachmentpack_p.h> #include <private/qgraphicsutils_p.h> diff --git a/src/render/backend/qrenderaspect.cpp b/src/render/backend/qrenderaspect.cpp index 2b4418b67..60cc6ab36 100644 --- a/src/render/backend/qrenderaspect.cpp +++ b/src/render/backend/qrenderaspect.cpp @@ -61,7 +61,6 @@ #include <Qt3DRenderer/qrendertargetselector.h> #include <Qt3DRenderer/qtechniquefilter.h> #include <Qt3DRenderer/qviewport.h> -#include <Qt3DRenderer/renderlogging.h> #include <Qt3DRenderer/qrendertarget.h> #include <Qt3DRenderer/qclearbuffer.h> #include <Qt3DRenderer/qtexture.h> @@ -83,6 +82,7 @@ #include <Qt3DRenderer/private/clearbuffer_p.h> #include <Qt3DRenderer/private/sortmethod_p.h> #include <Qt3DRenderer/private/sortcriterion_p.h> +#include <Qt3DRenderer/private/renderlogging_p.h> #include <Qt3DRenderer/private/rendernodefunctor_p.h> #include <Qt3DRenderer/private/framegraphnode_p.h> #include <Qt3DCore/qentity.h> diff --git a/src/render/backend/quniformvalue.cpp b/src/render/backend/quniformvalue.cpp index 0de6a9c6e..e3ae1f1a3 100644 --- a/src/render/backend/quniformvalue.cpp +++ b/src/render/backend/quniformvalue.cpp @@ -50,7 +50,7 @@ #include <QDebug> #include <QColor> #include <QQuaternion> -#include "renderlogging.h" +#include <Qt3DRenderer/private/renderlogging_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/quniformvalue_p.h b/src/render/backend/quniformvalue_p.h index b08fd5eb7..c6aecb4a9 100644 --- a/src/render/backend/quniformvalue_p.h +++ b/src/render/backend/quniformvalue_p.h @@ -47,7 +47,7 @@ #include <QVector> #include <QOpenGLShaderProgram> #include <Qt3DCore/qnodeuuid.h> -#include <Qt3DRenderer/renderlogging.h> +#include <Qt3DRenderer/private/renderlogging_p.h> // for RenderTexturePtr #include <Qt3DRenderer/private/rendertextureprovider_p.h> diff --git a/src/render/backend/rendercameralens.cpp b/src/render/backend/rendercameralens.cpp index def37c8d2..96ae7f6f5 100644 --- a/src/render/backend/rendercameralens.cpp +++ b/src/render/backend/rendercameralens.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "rendercameralens_p.h" -#include "renderlogging.h" +#include <Qt3DRenderer/private/renderlogging_p.h> #include <Qt3DCore/qtransform.h> #include <Qt3DCore/qcameralens.h> diff --git a/src/render/backend/renderentity.cpp b/src/render/backend/renderentity.cpp index e268a8932..0212fdba2 100644 --- a/src/render/backend/renderentity.cpp +++ b/src/render/backend/renderentity.cpp @@ -47,7 +47,7 @@ #include <Qt3DRenderer/qlayer.h> #include <Qt3DRenderer/qmaterial.h> #include <Qt3DRenderer/qmesh.h> -#include <Qt3DRenderer/renderlogging.h> +#include <Qt3DRenderer/private/renderlogging_p.h> #include <Qt3DRenderer/sphere.h> #include <Qt3DCore/qcameralens.h> diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp index 8075ddc3f..43c721ebc 100644 --- a/src/render/backend/renderer.cpp +++ b/src/render/backend/renderer.cpp @@ -53,7 +53,6 @@ #include <Qt3DRenderer/qshaderprogram.h> #include <Qt3DRenderer/qtechnique.h> #include <Qt3DRenderer/qrenderaspect.h> -#include <Qt3DRenderer/renderlogging.h> #include <Qt3DRenderer/qeffect.h> #include <Qt3DRenderer/private/blendstate_p.h> @@ -64,6 +63,7 @@ #include <Qt3DRenderer/private/rendercameralens_p.h> #include <Qt3DRenderer/private/rendercommand_p.h> #include <Qt3DRenderer/private/renderentity_p.h> +#include <Qt3DRenderer/private/renderlogging_p.h> #include <Qt3DRenderer/private/rendermaterial_p.h> #include <Qt3DRenderer/private/rendermesh_p.h> #include <Qt3DRenderer/private/renderpassfilternode_p.h> diff --git a/src/render/backend/renderthread.cpp b/src/render/backend/renderthread.cpp index 7e71e8e63..53a511227 100644 --- a/src/render/backend/renderthread.cpp +++ b/src/render/backend/renderthread.cpp @@ -43,7 +43,7 @@ #include <Qt3DRenderer/private/renderer_p.h> #include <Qt3DRenderer/private/renderview_p.h> -#include "renderlogging.h" +#include <Qt3DRenderer/private/renderlogging_p.h> #include <QEventLoop> #include <QTime> #include <QMutexLocker> diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp index 1a9809f8d..8d792d611 100644 --- a/src/render/backend/renderview.cpp +++ b/src/render/backend/renderview.cpp @@ -42,7 +42,6 @@ #include "renderview_p.h" #include <Qt3DRenderer/qmaterial.h> -#include <Qt3DRenderer/renderlogging.h> #include <Qt3DRenderer/qtexture.h> #include <Qt3DRenderer/qrendertarget.h> #include <Qt3DRenderer/sphere.h> @@ -60,6 +59,7 @@ #include <Qt3DRenderer/private/renderer_p.h> #include <Qt3DRenderer/private/renderlayer_p.h> #include <Qt3DRenderer/private/renderlight_p.h> +#include <Qt3DRenderer/private/renderlogging_p.h> #include <Qt3DRenderer/private/renderpassfilternode_p.h> #include <Qt3DRenderer/private/renderrenderpass_p.h> #include <Qt3DRenderer/private/renderstate_p.h> diff --git a/src/render/frontend/qabstractsceneloader.cpp b/src/render/frontend/qabstractsceneloader.cpp index a316e1623..0e76003e7 100644 --- a/src/render/frontend/qabstractsceneloader.cpp +++ b/src/render/frontend/qabstractsceneloader.cpp @@ -41,7 +41,7 @@ #include "qabstractsceneloader.h" #include "qabstractsceneloader_p.h" -#include "renderlogging.h" +#include <Qt3DRenderer/private/renderlogging_p.h> #include <Qt3DRenderer/private/abstractsceneparser_p.h> #include <Qt3DRenderer/private/gltfparser_p.h> #include <Qt3DCore/qscenepropertychange.h> diff --git a/src/render/frontend/qcuboidmesh.cpp b/src/render/frontend/qcuboidmesh.cpp index 5186999bb..5918d912b 100644 --- a/src/render/frontend/qcuboidmesh.cpp +++ b/src/render/frontend/qcuboidmesh.cpp @@ -42,10 +42,10 @@ #include "qcuboidmesh.h" #include "qcuboidmesh_p.h" -#include <Qt3DRenderer/renderlogging.h> #include <Qt3DRenderer/qattribute.h> #include <Qt3DRenderer/qbuffer.h> #include <Qt3DRenderer/qmeshdata.h> +#include <Qt3DRenderer/private/renderlogging_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/frontend/qmaterial.cpp b/src/render/frontend/qmaterial.cpp index 2c4eaaaa0..8998a1b1e 100644 --- a/src/render/frontend/qmaterial.cpp +++ b/src/render/frontend/qmaterial.cpp @@ -43,7 +43,7 @@ #include "qmaterial_p.h" #include "qtexture.h" #include "qeffect.h" -#include "renderlogging.h" +#include <Qt3DRenderer/private/renderlogging_p.h> #include "qparameter.h" #include <Qt3DCore/qscenepropertychange.h> diff --git a/src/render/frontend/qmesh.cpp b/src/render/frontend/qmesh.cpp index c5ba7e251..48103eb7e 100644 --- a/src/render/frontend/qmesh.cpp +++ b/src/render/frontend/qmesh.cpp @@ -47,7 +47,7 @@ #include <QFileInfo> #include <Qt3DRenderer/private/objloader_p.h> #include <Qt3DCore/qscenepropertychange.h> -#include "renderlogging.h" +#include <Qt3DRenderer/private/renderlogging_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/frontend/qparameter.cpp b/src/render/frontend/qparameter.cpp index bc1ee940c..2d3c1d857 100644 --- a/src/render/frontend/qparameter.cpp +++ b/src/render/frontend/qparameter.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qparameter.h" -#include "renderlogging.h" +#include <Qt3DRenderer/private/renderlogging_p.h> #include <Qt3DCore/qscenepropertychange.h> #include <private/qparameter_p.h> #include <Qt3DRenderer/qtexture.h> diff --git a/src/render/frontend/qplanemesh.cpp b/src/render/frontend/qplanemesh.cpp index 261e1186d..35b661df7 100644 --- a/src/render/frontend/qplanemesh.cpp +++ b/src/render/frontend/qplanemesh.cpp @@ -42,10 +42,10 @@ #include "qplanemesh.h" #include "qplanemesh_p.h" -#include <Qt3DRenderer/renderlogging.h> #include <Qt3DRenderer/qattribute.h> #include <Qt3DRenderer/qbuffer.h> #include <Qt3DRenderer/qmeshdata.h> +#include <Qt3DRenderer/private/renderlogging_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/frontend/qsceneloader.cpp b/src/render/frontend/qsceneloader.cpp index 73a4fcbdf..35443f77d 100644 --- a/src/render/frontend/qsceneloader.cpp +++ b/src/render/frontend/qsceneloader.cpp @@ -44,7 +44,7 @@ #include <Qt3DCore/qsceneinterface.h> #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DCore/qentity.h> -#include "renderlogging.h" +#include <Qt3DRenderer/private/renderlogging_p.h> #include <QThread> QT_BEGIN_NAMESPACE diff --git a/src/render/frontend/qspheremesh.cpp b/src/render/frontend/qspheremesh.cpp index b4b530983..2abec129e 100644 --- a/src/render/frontend/qspheremesh.cpp +++ b/src/render/frontend/qspheremesh.cpp @@ -45,7 +45,7 @@ #endif #include "qspheremesh.h" -#include "renderlogging.h" +#include <Qt3DRenderer/private/renderlogging_p.h> #include "qbuffer.h" #include "qattribute.h" #include "qmeshdata.h" diff --git a/src/render/io/abstractsceneparser.cpp b/src/render/io/abstractsceneparser.cpp index e52968f60..7ba677c4c 100644 --- a/src/render/io/abstractsceneparser.cpp +++ b/src/render/io/abstractsceneparser.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "abstractsceneparser_p.h" -#include "renderlogging.h" +#include <Qt3DRenderer/private/renderlogging_p.h> #include <QStringList> QT_BEGIN_NAMESPACE diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp index 1a5f5e440..6866f2b0d 100644 --- a/src/render/io/gltfparser.cpp +++ b/src/render/io/gltfparser.cpp @@ -43,7 +43,7 @@ #include "gltfparser_p.h" #include "texturedata.h" -#include "renderlogging.h" +#include <Qt3DRenderer/private/renderlogging_p.h> #include <Qt3DCore/qentity.h> #include <qmesh.h> diff --git a/src/render/io/objloader.cpp b/src/render/io/objloader.cpp index ad64e29e2..0c5d088d9 100644 --- a/src/render/io/objloader.cpp +++ b/src/render/io/objloader.cpp @@ -46,7 +46,7 @@ #include "qattribute.h" #include <Qt3DCore/qaxisalignedboundingbox.h> -#include "renderlogging.h" +#include <Qt3DRenderer/private/renderlogging_p.h> #include <QFile> #include <QOpenGLBuffer> #include <QOpenGLShaderProgram> diff --git a/src/render/io/qattribute.cpp b/src/render/io/qattribute.cpp index cfa08aa7a..516107f7e 100644 --- a/src/render/io/qattribute.cpp +++ b/src/render/io/qattribute.cpp @@ -45,7 +45,7 @@ #include <QVector2D> #include <QVector> #include <Qt3DCore/qabstractbuffer.h> -#include "renderlogging.h" +#include <Qt3DRenderer/private/renderlogging_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/io/qbuffer.cpp b/src/render/io/qbuffer.cpp index 8f2084cd4..03bd0b50e 100644 --- a/src/render/io/qbuffer.cpp +++ b/src/render/io/qbuffer.cpp @@ -41,7 +41,7 @@ #include "qbuffer.h" #include "qbuffer_p.h" -#include "renderlogging.h" +#include <Qt3DRenderer/private/renderlogging_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/render.pro b/src/render/render.pro index 46e77ea3a..f31195c67 100644 --- a/src/render/render.pro +++ b/src/render/render.pro @@ -31,7 +31,7 @@ gcov { HEADERS += $$PRIVATE_HEADERS \ qt3drenderer_global.h \ qt3drenderer_global_p.h \ - renderlogging.h + renderlogging_p.h !contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL diff --git a/src/render/renderlogging.cpp b/src/render/renderlogging.cpp index 57a3b46be..b9e7a4618 100644 --- a/src/render/renderlogging.cpp +++ b/src/render/renderlogging.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "renderlogging.h" +#include "renderlogging_p.h" QT_BEGIN_NAMESPACE diff --git a/src/render/renderlogging.h b/src/render/renderlogging_p.h index 2f5774016..790be7adb 100644 --- a/src/render/renderlogging.h +++ b/src/render/renderlogging_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERLOGGING_H -#define QT3D_RENDER_RENDERLOGGING_H +#ifndef QT3D_RENDER_RENDERLOGGING_P_H +#define QT3D_RENDER_RENDERLOGGING_P_H #include <QLoggingCategory> @@ -65,4 +65,4 @@ Q_DECLARE_LOGGING_CATEGORY(Memory) QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERLOGGING_H +#endif // QT3D_RENDER_RENDERLOGGING_P_H |