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 /src/quickcontrols/basic/impl/qquickbasicbusyindicator.cpp | |
| 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>
Diffstat (limited to 'src/quickcontrols/basic/impl/qquickbasicbusyindicator.cpp')
| -rw-r--r-- | src/quickcontrols/basic/impl/qquickbasicbusyindicator.cpp | 6 |
1 files changed, 3 insertions, 3 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; |