diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-03 14:40:02 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-07 19:23:12 +0100 |
| commit | 81bad2a9b2096d6a800e861f3f4eb556a619a681 (patch) | |
| tree | 1320b4995b8c3b96d4bdb7c42e63b3f8e7c37716 | |
| parent | 1f207f4a97bb6fb482cc5c8a52ce986c0e1f3a48 (diff) | |
QtQuickControls: Disambiguate static constants
They cause clashes in CMake Unity (Jumbo) builds.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: I6e7fbb1d3f33eda50f55257b6df5aaf47170eb57
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
4 files changed, 20 insertions, 20 deletions
diff --git a/src/quickcontrols/basic/impl/qquickbasicbusyindicator.cpp b/src/quickcontrols/basic/impl/qquickbasicbusyindicator.cpp index 2acefa2bed..d6cceb2a56 100644 --- a/src/quickcontrols/basic/impl/qquickbasicbusyindicator.cpp +++ b/src/quickcontrols/basic/impl/qquickbasicbusyindicator.cpp @@ -10,7 +10,7 @@ QT_BEGIN_NAMESPACE static const int CircleCount = 10; -static const int TotalDuration = 100 * CircleCount * 2; +static const int QbbiTotalDuration = 100 * CircleCount * 2; static const QRgb TransparentColor = 0x00000000; static QPointF moveCircle(const QPointF &pos, qreal rotation, qreal distance) @@ -35,7 +35,7 @@ QQuickBasicBusyIndicatorNode::QQuickBasicBusyIndicatorNode(QQuickBasicBusyIndica : QQuickAnimatedNode(item) { setLoopCount(Infinite); - setDuration(TotalDuration); + setDuration(QbbiTotalDuration); setCurrentTime(item->elapsed()); for (int i = 0; i < CircleCount; ++i) { @@ -51,7 +51,7 @@ QQuickBasicBusyIndicatorNode::QQuickBasicBusyIndicatorNode(QQuickBasicBusyIndica void QQuickBasicBusyIndicatorNode::updateCurrentTime(int time) { - const qreal percentageComplete = time / qreal(TotalDuration); + const qreal percentageComplete = time / qreal(QbbiTotalDuration); const qreal firstPhaseProgress = percentageComplete <= 0.5 ? percentageComplete * 2 : 0; const qreal secondPhaseProgress = percentageComplete > 0.5 ? (percentageComplete - 0.5) * 2 : 0; diff --git a/src/quickcontrols/basic/impl/qquickbasicprogressbar.cpp b/src/quickcontrols/basic/impl/qquickbasicprogressbar.cpp index 4dbe04e4b1..69d34f4e0f 100644 --- a/src/quickcontrols/basic/impl/qquickbasicprogressbar.cpp +++ b/src/quickcontrols/basic/impl/qquickbasicprogressbar.cpp @@ -15,9 +15,9 @@ static const int BlockWidth = 16; static const int BlockRestingSpacing = 4; static const int BlockMovingSpacing = 48; static const int BlockSpan = Blocks * (BlockWidth + BlockRestingSpacing) - BlockRestingSpacing; -static const int TotalDuration = 4000; -static const int SecondPhaseStart = TotalDuration * 0.4; -static const int ThirdPhaseStart = TotalDuration * 0.6; +static const int QbpbTotalDuration = 4000; +static const int SecondPhaseStart = QbpbTotalDuration * 0.4; +static const int ThirdPhaseStart = QbpbTotalDuration * 0.6; static inline qreal blockStartX(int blockIndex) { @@ -53,7 +53,7 @@ QQuickBasicProgressBarNode::QQuickBasicProgressBarNode(QQuickBasicProgressBar *i m_pixelsPerSecond(item->width()) { setLoopCount(Infinite); - setDuration(TotalDuration); + setDuration(QbpbTotalDuration); } void QQuickBasicProgressBarNode::updateCurrentTime(int time) diff --git a/src/quickcontrols/material/impl/qquickmaterialprogressbar.cpp b/src/quickcontrols/material/impl/qquickmaterialprogressbar.cpp index 67c9f614f5..19e02dc5b7 100644 --- a/src/quickcontrols/material/impl/qquickmaterialprogressbar.cpp +++ b/src/quickcontrols/material/impl/qquickmaterialprogressbar.cpp @@ -16,7 +16,7 @@ QT_BEGIN_NAMESPACE static const int PauseDuration = 520; static const int SlideDuration = 1240; -static const int TotalDuration = SlideDuration + PauseDuration; +static const int QmpbTotalDuration = SlideDuration + PauseDuration; class QQuickMaterialProgressBarNode : public QQuickAnimatedNode { @@ -37,7 +37,7 @@ QQuickMaterialProgressBarNode::QQuickMaterialProgressBarNode(QQuickMaterialProgr : QQuickAnimatedNode(item) { setLoopCount(Infinite); - setDuration(TotalDuration); + setDuration(QmpbTotalDuration); } void QQuickMaterialProgressBarNode::updateCurrentTime(int time) diff --git a/src/quickcontrols/universal/impl/qquickuniversalprogressbar.cpp b/src/quickcontrols/universal/impl/qquickuniversalprogressbar.cpp index 0ab47e8804..e5548992db 100644 --- a/src/quickcontrols/universal/impl/qquickuniversalprogressbar.cpp +++ b/src/quickcontrols/universal/impl/qquickuniversalprogressbar.cpp @@ -12,10 +12,10 @@ QT_BEGIN_NAMESPACE -static const int PhaseCount = 4; +static const int QupbPhaseCount = 4; static const int EllipseCount = 5; -static const int Interval = 167; -static const int TotalDuration = 3917; +static const int QupbInterval = 167; +static const int QupbTotalDuration = 3917; static const int VisibleDuration = 3000; static const qreal EllipseDiameter = 4; static const qreal EllipseOffset = 4; @@ -42,15 +42,15 @@ private: }; bool m_indeterminate = false; - Phase m_borderPhases[PhaseCount]; - Phase m_ellipsePhases[PhaseCount]; + Phase m_borderPhases[QupbPhaseCount]; + Phase m_ellipsePhases[QupbPhaseCount]; }; QQuickUniversalProgressBarNode::QQuickUniversalProgressBarNode(QQuickUniversalProgressBar *item) : QQuickAnimatedNode(item) { setLoopCount(Infinite); - setDuration(TotalDuration); + setDuration(QupbTotalDuration); m_borderPhases[0] = Phase( 500, -50, 0); m_borderPhases[1] = Phase(1500, 0, 0); @@ -79,7 +79,7 @@ void QQuickUniversalProgressBarNode::updateCurrentTime(int time) { qreal from = ContainerAnimationStartPosition; qreal to = from + ContainerAnimationEndPosition * width; - qreal progress = static_cast<qreal>(time) / TotalDuration; + qreal progress = static_cast<qreal>(time) / QupbTotalDuration; qreal dx = from + (to - from) * progress; QMatrix4x4 matrix; @@ -98,8 +98,8 @@ void QQuickUniversalProgressBarNode::updateCurrentTime(int time) QSGOpacityNode *opacityNode = static_cast<QSGOpacityNode *>(ellipseNode->firstChild()); Q_ASSERT(opacityNode->type() == QSGNode::OpacityNodeType); - int begin = nodeIndex * Interval; - int end = VisibleDuration + nodeIndex * Interval; + int begin = nodeIndex * QupbInterval; + int end = VisibleDuration + nodeIndex * QupbInterval; bool visible = time >= begin && time <= end; opacityNode->setOpacity(visible ? 1.0 : 0.0); @@ -107,7 +107,7 @@ void QQuickUniversalProgressBarNode::updateCurrentTime(int time) if (visible) { { int phaseIndex, remain = time, elapsed = 0; - for (phaseIndex = 0; phaseIndex < PhaseCount - 1; ++phaseIndex) { + for (phaseIndex = 0; phaseIndex < QupbPhaseCount - 1; ++phaseIndex) { if (remain <= m_borderPhases[phaseIndex].duration + begin) break; remain -= m_borderPhases[phaseIndex].duration; @@ -130,7 +130,7 @@ void QQuickUniversalProgressBarNode::updateCurrentTime(int time) curve.addCubicBezierSegment(QPointF(0.4, 0.0), QPointF(0.6, 1.0), QPointF(1.0, 1.0)); int phaseIndex, remain = time, elapsed = 0; - for (phaseIndex = 0; phaseIndex < PhaseCount - 1; ++phaseIndex) { + for (phaseIndex = 0; phaseIndex < QupbPhaseCount - 1; ++phaseIndex) { if (remain <= m_ellipsePhases[phaseIndex].duration + begin) break; remain -= m_ellipsePhases[phaseIndex].duration; |