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:
	src/plugins/qmlprojectmanager/qmlprojectplugin.cpp

Change-Id: I14030f58303839e706af892dd12a67566e3bed68
This commit is contained in:
Eike Ziller
2022-05-18 13:07:59 +02:00
parent 54d4c4db62 e608243ee5
commit 6a296ab68a
89 changed files with 2011 additions and 791 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,10 +214,9 @@ QmlTimeline CurveEditorView::activeTimeline() const
if (node.hasVariantProperty("enabled")
&& node.variantProperty("enabled").value().toBool())
return QmlTimeline(node);
return {};
}
}
return {};
}
for (const ModelNode &node : allModelNodesOfType("QtQuick.Timeline.Timeline")) {
@@ -226,8 +225,9 @@ QmlTimeline CurveEditorView::activeTimeline() const
if (!propertyChanges.isValid())
continue;
if (node.hasVariantProperty("enabled") && node.variantProperty("enabled").value().toBool())
return QmlTimeline(node);
if (propertyChanges.modelNode().hasProperty("enabled") &&
propertyChanges.modelNode().variantProperty("enabled").value().toBool())
return QmlTimeline(node);
}
}
return {};