diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-06 13:49:02 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-13 08:16:21 +0100 |
| commit | ac3fa51e5f3598b291fa805f173c5fa2209b5128 (patch) | |
| tree | 903f71edb0f4478ef21ee048f4ab76b5eb516a8d /src/datavisualization/engine/selectionpointer.cpp | |
| parent | b4cb821c1e0059eb37176d5534b74914f4ef2a3d (diff) | |
Fix CMake Unity (Jumbo) builds
Disambiguate a few static constants.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: I6cd2cf3af13b1122ead5ec42b655eb52cdbd2cea
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
Diffstat (limited to 'src/datavisualization/engine/selectionpointer.cpp')
| -rw-r--r-- | src/datavisualization/engine/selectionpointer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/datavisualization/engine/selectionpointer.cpp b/src/datavisualization/engine/selectionpointer.cpp index 15020acd..d78171e3 100644 --- a/src/datavisualization/engine/selectionpointer.cpp +++ b/src/datavisualization/engine/selectionpointer.cpp @@ -10,7 +10,7 @@ QT_BEGIN_NAMESPACE -const GLfloat sliceUnits = 2.5; +const GLfloat spSliceUnits = 2.5; SelectionPointer::SelectionPointer(Drawer *drawer) : QObject(0), @@ -68,7 +68,7 @@ void SelectionPointer::renderSelectionPointer(GLuint defaultFboHandle, bool useO QMatrix4x4 projectionMatrix; GLfloat viewPortRatio = (GLfloat)m_mainViewPort.width() / (GLfloat)m_mainViewPort.height(); if (m_cachedIsSlicingActivated) { - GLfloat sliceUnitsScaled = sliceUnits / m_autoScaleAdjustment; + GLfloat sliceUnitsScaled = spSliceUnits / m_autoScaleAdjustment; viewMatrix.lookAt(QVector3D(0.0f, 0.0f, 1.0f), zeroVector, upVector); projectionMatrix.ortho(-sliceUnitsScaled * viewPortRatio, sliceUnitsScaled * viewPortRatio, -sliceUnitsScaled, sliceUnitsScaled, @@ -138,7 +138,7 @@ void SelectionPointer::renderSelectionLabel(GLuint defaultFboHandle, bool useOrt QMatrix4x4 projectionMatrix; GLfloat viewPortRatio = (GLfloat)m_mainViewPort.width() / (GLfloat)m_mainViewPort.height(); if (m_cachedIsSlicingActivated) { - GLfloat sliceUnitsScaled = sliceUnits / m_autoScaleAdjustment; + GLfloat sliceUnitsScaled = spSliceUnits / m_autoScaleAdjustment; viewMatrix.lookAt(QVector3D(0.0f, 0.0f, 1.0f), zeroVector, upVector); projectionMatrix.ortho(-sliceUnitsScaled * viewPortRatio, sliceUnitsScaled * viewPortRatio, -sliceUnitsScaled, sliceUnitsScaled, |