diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-04-21 10:17:36 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-04-21 19:38:26 +0000 |
| commit | 7ef2c91014fe292ff6f7f4fa58dbff53ec00d6fe (patch) | |
| tree | abda041df9f9b11aadaab8e7629b5d1fca04ef3b | |
| parent | e41b97b8d448d3adc62a5dfde974fdec2382de35 (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.
Task-number: QTBUG-109394
Change-Id: Iba5b27a9e066de4c4502b30f5c265770bf991649
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 247f236440d0aa7e81a90150d9b8867e0de0a539)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -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 |