From 182bb9d04d9df1d70ff379bbd70ae11bb45f80dc Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Tue, 24 Jun 2025 13:04:06 +0800 Subject: [PATCH] Adjust to QUnifiedTimer slow mode changes a318e331f1387eb3c9d13be96c28619453a35571 in qtbase. Task-number: QTBUG-137919 Change-Id: I98e3871053bbb04b83aa114844f07293501d95d6 Reviewed-by: Fabian Kosmale Reviewed-by: Ulf Hermann --- src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp | 3 +-- src/quick/designer/qquickdesignersupportitems.cpp | 3 +-- tools/qml/main.cpp | 2 +- tools/qmlscene/main.cpp | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp index fb9ec74dc6..a5290e5a97 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp @@ -306,8 +306,7 @@ void GlobalInspector::processMessage(const QByteArray &message) } else if (command == SET_ANIMATION_SPEED) { qreal speed; ds >> speed; - QUnifiedTimer::instance()->setSlowModeEnabled(speed != 1.0); - QUnifiedTimer::instance()->setSlowdownFactor(speed); + QUnifiedTimer::instance()->setSpeedModifier(1 / speed); } else if (command == SHOW_APP_ON_TOP) { bool showOnTop; ds >> showOnTop; diff --git a/src/quick/designer/qquickdesignersupportitems.cpp b/src/quick/designer/qquickdesignersupportitems.cpp index f1e5e1e317..acee5669b6 100644 --- a/src/quick/designer/qquickdesignersupportitems.cpp +++ b/src/quick/designer/qquickdesignersupportitems.cpp @@ -296,8 +296,7 @@ void QQuickDesignerSupportItems::disableBehaivour(QObject *object) void QQuickDesignerSupportItems::stopUnifiedTimer() { - QUnifiedTimer::instance()->setSlowdownFactor(0.00001); - QUnifiedTimer::instance()->setSlowModeEnabled(true); + QUnifiedTimer::instance()->setSpeedModifier(0); } void QQuickDesignerSupportItems::registerFixResourcePathsForObjectCallBack(void (*callback)(QObject *)) diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index 825c320c96..26267138ba 100644 --- a/tools/qml/main.cpp +++ b/tools/qml/main.cpp @@ -559,7 +559,7 @@ int main(int argc, char *argv[]) } #if QT_CONFIG(qml_animation) if (parser.isSet(slowAnimationsOption)) - QUnifiedTimer::instance()->setSlowModeEnabled(true); + QUnifiedTimer::instance()->setSpeedModifier(0.2); if (parser.isSet(fixedAnimationsOption)) QUnifiedTimer::instance()->setConsistentTiming(true); #endif diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index 123844ebb3..129e83c62a 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -537,7 +537,7 @@ int main(int argc, char ** argv) QQuickWindow::setTextRenderType(options.textRenderType); - QUnifiedTimer::instance()->setSlowModeEnabled(options.slowAnimations); + QUnifiedTimer::instance()->setSpeedModifier(options.slowAnimations ? 0.2 : 1); if (options.rhi) { if (options.rhiBackendSet)