diff options
author | Tim Blechmann <tim@klingt.org> | 2024-02-07 13:25:40 +0800 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-02-07 10:48:47 +0000 |
commit | c232e710fb5192db089034708f617c81d8b1bb63 (patch) | |
tree | 3f14b00d972602cd12265ef163f4e8d395718b25 /src/render/materialsystem/material.cpp | |
parent | c0c53854c996aedca7bec0214be4380c5ab5f866 (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
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit 06bb491354489b06998306ea9de87da92314b397)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/render/materialsystem/material.cpp')
-rw-r--r-- | src/render/materialsystem/material.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/materialsystem/material.cpp b/src/render/materialsystem/material.cpp index 10737d647..16ee6f62b 100644 --- a/src/render/materialsystem/material.cpp +++ b/src/render/materialsystem/material.cpp @@ -10,13 +10,13 @@ #include "qeffect.h" #include <Qt3DRender/private/qmaterial_p.h> -using namespace Qt3DCore; - QT_BEGIN_NAMESPACE namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + Material::Material() : BackendNode() { |