diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-03 14:40:02 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-02-08 09:34:02 +0000 |
| commit | fa25e8292f136846d07b64eea8439912603998ad (patch) | |
| tree | 34c4a6e3c47e0fd529065bafd581a1d73eb58527 /src/quickcontrols/basic/impl/qquickbasicprogressbar.cpp | |
| parent | 34e568196b03389ba21ab84d86aa7dde789f3464 (diff) | |
QtQuickControls: Disambiguate static constants
They cause clashes in CMake Unity (Jumbo) builds.
Task-number: QTBUG-109394
Change-Id: I6e7fbb1d3f33eda50f55257b6df5aaf47170eb57
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit 81bad2a9b2096d6a800e861f3f4eb556a619a681)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/quickcontrols/basic/impl/qquickbasicprogressbar.cpp')
| -rw-r--r-- | src/quickcontrols/basic/impl/qquickbasicprogressbar.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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) |