1 files changed, 19 insertions, 3 deletions
diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp
index ea065e49a1..5d693f5422 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp
+++ b/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp
@@ -38,7 +38,6 @@
 #include <variantproperty.h>
 #include <qmlstate.h>
 #include <qmltimeline.h>
-#include <qmltimelinekeyframegroup.h>
 
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/command.h>
@@ -112,6 +111,23 @@ TimelineToolBar::TimelineToolBar(QWidget *parent)
             &AnimationCurveEditorModel::currentFrameChanged,
             this,
             &TimelineToolBar::currentFrameChanged);
+
+    auto setStartFrameValue = [this](int val) {
+        if (m_firstFrame) {
+            m_firstFrame->setText(QString::number(val, 'f', 0));
+            emit startFrameChanged(val);
+        }
+    };
+    connect(m_curveModel, &AnimationCurveEditorModel::startFrameChanged, setStartFrameValue);
+
+    auto setEndFrameValue = [this](int val) {
+        if (m_lastFrame) {
+            m_lastFrame->setText(QString::number(val, 'f', 0));
+            emit endFrameChanged(val);
+        }
+    };
+    connect(m_curveModel, &AnimationCurveEditorModel::endFrameChanged, setEndFrameValue);
+
     connect(m_curveModel,
             &AnimationCurveEditorModel::curveChanged,
             this,
@@ -181,7 +197,7 @@ void TimelineToolBar::setCurrentTimeline(const QmlTimeline &timeline)
 
 void TimelineToolBar::setStartFrame(qreal frame)
 {
-    m_curveModel->setMinimumTime(frame);
+    m_curveModel->setMinimumTime(frame, true);
 
     auto text = QString::number(frame, 'f', 0);
     m_firstFrame->setText(text);
@@ -198,7 +214,7 @@ void TimelineToolBar::setCurrentFrame(qreal frame)
 
 void TimelineToolBar::setEndFrame(qreal frame)
 {
-    m_curveModel->setMaximumTime(frame);
+    m_curveModel->setMaximumTime(frame, true);
 
     auto text = QString::number(frame, 'f', 0);
     m_lastFrame->setText(text);