diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-06 17:42:55 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-02-10 17:56:00 +0000 |
| commit | a3c675b4b2611ff741b28aca086fb2654d966e27 (patch) | |
| tree | 9053b45e9afb6b7cce4a9355bbfa9621ca3936c9 | |
| parent | 4684ce7bffbb0e753dce29f12aa3f6a25d1b29d4 (diff) | |
| download | qt3d-a3c675b4b2611ff741b28aca086fb2654d966e27.tar.gz | |
Fix warnings about fields anonymous namespaces
Remove anonymous namespace, fixing warning:
qsgareaallocator.cpp:27:8: warning: QSGAreaAllocatorNode has a field QSGAreaAllocatorNode::splitType whose type uses the anonymous namespace [-Wsubobject-linkage]
which occur in CMake Unity (Jumbo) builds.
Task-number: QTBUG-109394
Change-Id: Ieb575215dad57df299e3ea11cc9f1504f311fada
Reviewed-by: Inho Lee <inho.lee@qt.io>
Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit f0eb452a19c8a77ed3dd9f0837db1bfa3bca3ede)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/extras/text/areaallocator.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/extras/text/areaallocator.cpp b/src/extras/text/areaallocator.cpp index 4a7404d97..b2aedfd88 100644 --- a/src/extras/text/areaallocator.cpp +++ b/src/extras/text/areaallocator.cpp @@ -15,16 +15,13 @@ QT_BEGIN_NAMESPACE namespace Qt3DExtras { -namespace +enum SplitType { - enum SplitType - { - VerticalSplit, - HorizontalSplit - }; + VerticalSplit, + HorizontalSplit +}; - static const int maxMargin = 2; -} +static const int maxMargin = 2; struct AreaAllocatorNode { |