feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/7.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/languageclient/languageclientoutline.cpp

Change-Id: I106fbde6467818368a8358d612d793313cad27e6
This commit is contained in:
Eike Ziller
2022-05-02 15:06:08 +02:00
parent 07195cea8b 9159bdaed2
commit 1b7295514c
51 changed files with 1868 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp
View File

@@ -395,11 +395,7 @@ void CurveEditorView::commitEndFrame(int frame)
void CurveEditorView::init()
{
QmlTimeline timeline = activeTimeline();
if (timeline.isValid()) {
m_model->setTimeline(timeline);
}
m_model->setTimeline(activeTimeline());
}
} // namespace QmlDesigner