diff options
| author | Tim Blechmann <tim@klingt.org> | 2024-02-07 13:25:40 +0800 |
|---|---|---|
| committer | Tim Blechmann <tim@klingt.org> | 2024-02-07 17:23:03 +0800 |
| commit | 06bb491354489b06998306ea9de87da92314b397 (patch) | |
| tree | 9e199a73279cb1146cd15451441ba43abb7c74bb /src/render/frontend | |
| parent | 84423051fedf1ec51fffe781ba52affe52f1a8e5 (diff) | |
build system: fix unity builds
we need to avoid polluting the global (or qt) namespace by moving the
`using namespace Qt3DXXX` statements into the namespace where it's
actually required.
furthermore:
* replace `QT_USE_NAMESPACE` with `QT_BEGIN_NAMESPACE`/`END` pair
* exclude some translation units with name clashes inside anonymous
namespaces
Change-Id: I5301b55c6a0c7079602c759f5bde152354149880
Pick-to: 6.7
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/render/frontend')
| -rw-r--r-- | src/render/frontend/qrenderaspect.cpp | 3 | ||||
| -rw-r--r-- | src/render/frontend/qrendertarget.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp index 131610159..55f4b51c9 100644 --- a/src/render/frontend/qrenderaspect.cpp +++ b/src/render/frontend/qrenderaspect.cpp @@ -155,7 +155,6 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace { @@ -234,6 +233,8 @@ QStringList dumpSGFilterState(Qt3DRender::Render::TechniqueManager *manager, } namespace Qt3DRender { +using namespace Qt3DCore; + #define CreateSynchronizerJobPtr(lambda, type) \ Render::SynchronizerJobPtr::create(lambda, type, #type) diff --git a/src/render/frontend/qrendertarget.cpp b/src/render/frontend/qrendertarget.cpp index dae4f3f55..fd914bb0e 100644 --- a/src/render/frontend/qrendertarget.cpp +++ b/src/render/frontend/qrendertarget.cpp @@ -7,10 +7,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { +using namespace Qt3DCore; + /*! \class Qt3DRender::QRenderTarget \brief The QRenderTarget class encapsulates a target (usually a frame buffer |