diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-04-21 10:17:36 +0200 |
|---|---|---|
| committer | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-04-21 21:14:57 +0200 |
| commit | 247f236440d0aa7e81a90150d9b8867e0de0a539 (patch) | |
| tree | 6a66a317c946602818d27107afd2a578c2efd8c4 /src/datavisualization/utils | |
| parent | 13f3a9d17eb8930e78bdab0f8992815b158100ca (diff) | |
Resolve a duplicate symbol issue
On unity build, `itemScaler` is defined in `scatter3drenderer.cpp` as
well, and causes a symbol redefinition error. By making this one a
static member, we can avoid it.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: Iba5b27a9e066de4c4502b30f5c265770bf991649
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/datavisualization/utils')
| -rw-r--r-- | src/datavisualization/utils/scatterobjectbufferhelper.cpp | 2 | ||||
| -rw-r--r-- | src/datavisualization/utils/scatterobjectbufferhelper_p.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/datavisualization/utils/scatterobjectbufferhelper.cpp b/src/datavisualization/utils/scatterobjectbufferhelper.cpp index f4e6268e..0a04d038 100644 --- a/src/datavisualization/utils/scatterobjectbufferhelper.cpp +++ b/src/datavisualization/utils/scatterobjectbufferhelper.cpp @@ -9,7 +9,7 @@ QT_BEGIN_NAMESPACE -const GLfloat itemScaler = 3.0f; +const GLfloat ScatterObjectBufferHelper::itemScaler = 3.0f; ScatterObjectBufferHelper::ScatterObjectBufferHelper() : m_scaleY(0.0f) diff --git a/src/datavisualization/utils/scatterobjectbufferhelper_p.h b/src/datavisualization/utils/scatterobjectbufferhelper_p.h index a428ab9b..5328e029 100644 --- a/src/datavisualization/utils/scatterobjectbufferhelper_p.h +++ b/src/datavisualization/utils/scatterobjectbufferhelper_p.h @@ -37,6 +37,7 @@ private: const QList<QVector3D> &indexed_vertices); float m_scaleY; + static const GLfloat itemScaler; }; QT_END_NAMESPACE |