Fix CMake Unity (Jumbo) builds

Disambiguate a few static constants.

Task-number: QTBUG-109394
Change-Id: I6cd2cf3af13b1122ead5ec42b655eb52cdbd2cea
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
(cherry picked from commit ac3fa51e5f3598b291fa805f173c5fa2209b5128)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

6 files changed, 8 insertions, 12 deletions

diff --git a/src/datavisualization/data/abstractitemmodelhandler_p.h b/src/datavisualization/data/abstractitemmodelhandler_p.h
index 9bdd8683..64e61838 100644
--- a/src/datavisualization/data/abstractitemmodelhandler_p.h
+++ b/src/datavisualization/data/abstractitemmodelhandler_p.h
@@ -65,6 +65,8 @@ private:
     Q_DISABLE_COPY(AbstractItemModelHandler)
 };
 
+static constexpr int noRoleIndex = -1;
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualization/data/baritemmodelhandler.cpp b/src/datavisualization/data/baritemmodelhandler.cpp
index dfc0640e..4a8c8faa 100644
--- a/src/datavisualization/data/baritemmodelhandler.cpp
+++ b/src/datavisualization/data/baritemmodelhandler.cpp
@@ -5,8 +5,6 @@
 
 QT_BEGIN_NAMESPACE
 
-static const int noRoleIndex = -1;
-
 BarItemModelHandler::BarItemModelHandler(QItemModelBarDataProxy *proxy, QObject *parent)
     : AbstractItemModelHandler(parent),
       m_proxy(proxy),
diff --git a/src/datavisualization/data/scatteritemmodelhandler.cpp b/src/datavisualization/data/scatteritemmodelhandler.cpp
index d7e61a92..8aa4ba7d 100644
--- a/src/datavisualization/data/scatteritemmodelhandler.cpp
+++ b/src/datavisualization/data/scatteritemmodelhandler.cpp
@@ -5,8 +5,6 @@
 
 QT_BEGIN_NAMESPACE
 
-static const int noRoleIndex = -1;
-
 ScatterItemModelHandler::ScatterItemModelHandler(QItemModelScatterDataProxy *proxy, QObject *parent)
     : AbstractItemModelHandler(parent),
       m_proxy(proxy),
diff --git a/src/datavisualization/data/surfaceitemmodelhandler.cpp b/src/datavisualization/data/surfaceitemmodelhandler.cpp
index 31af3f6e..bdec0308 100644
--- a/src/datavisualization/data/surfaceitemmodelhandler.cpp
+++ b/src/datavisualization/data/surfaceitemmodelhandler.cpp
@@ -5,8 +5,6 @@
 
 QT_BEGIN_NAMESPACE
 
-static const int noRoleIndex = -1;
-
 SurfaceItemModelHandler::SurfaceItemModelHandler(QItemModelSurfaceDataProxy *proxy, QObject *parent)
     : AbstractItemModelHandler(parent),
       m_proxy(proxy),
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,
diff --git a/src/datavisualization/input/qtouch3dinputhandler.cpp b/src/datavisualization/input/qtouch3dinputhandler.cpp
index 9edbd87e..35b79a9f 100644
--- a/src/datavisualization/input/qtouch3dinputhandler.cpp
+++ b/src/datavisualization/input/qtouch3dinputhandler.cpp
@@ -15,7 +15,7 @@ static const int maxSelectionJitter = 10;
 static const int maxSelectionJitter = 5;
 #endif
 static const int tapAndHoldTime = 250;
-static const float rotationSpeed = 200.0f;
+static const float t3ihRotationSpeed = 200.0f;
 static const float touchZoomDrift = 0.02f;
 
 /*!
@@ -239,9 +239,9 @@ void QTouch3DInputHandlerPrivate::handleRotation(const QPointF &position)
         float yRotation = camera->yRotation();
         QPointF inputPos = q_ptr->inputPosition();
         float mouseMoveX = float(inputPos.x() - position.x())
-                / (scene->viewport().width() / rotationSpeed);
+                / (scene->viewport().width() / t3ihRotationSpeed);
         float mouseMoveY = float(inputPos.y() - position.y())
-                / (scene->viewport().height() / rotationSpeed);
+                / (scene->viewport().height() / t3ihRotationSpeed);
         xRotation -= mouseMoveX;
         yRotation -= mouseMoveY;
         camera->setXRotation(xRotation);