From 7c61cc31512a7e4a5d22a2cc14eeb351f0eacc71 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 30 Jan 2019 15:14:48 +0100 Subject: [PATCH] QmlDesigner: Avoid internal warnings Change-Id: I20c9d77a6758e70b138f9fec30a6845354d20880 Reviewed-by: Knud Dollereder Reviewed-by: Tim Jenssen --- .../timelineeditor/timelinesettingsmodel.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesettingsmodel.cpp b/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesettingsmodel.cpp index bbc4963955a..5eaee4e791e 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesettingsmodel.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesettingsmodel.cpp @@ -295,9 +295,11 @@ void TimelineSettingsModel::updateTimeline(int row) propertyChanges.modelNode().variantProperty("enabled").setValue(false); } - QmlPropertyChanges propertyChanges(modelState.propertyChanges(timeline)); - if (propertyChanges.isValid()) - propertyChanges.modelNode().variantProperty("enabled").setValue(true); + if (timeline.isValid()) { /* If timeline is invalid 'none' was selected */ + QmlPropertyChanges propertyChanges(modelState.propertyChanges(timeline)); + if (propertyChanges.isValid()) + propertyChanges.modelNode().variantProperty("enabled").setValue(true); + } } } catch (Exception &e) { @@ -345,9 +347,11 @@ void TimelineSettingsModel::updateAnimation(int row) } } - QmlPropertyChanges propertyChanges(modelState.propertyChanges(animation)); - if (propertyChanges.isValid()) - propertyChanges.modelNode().variantProperty("running").setValue(true); + if (animation.isValid()) { /* If animation is invalid 'none' was selected */ + QmlPropertyChanges propertyChanges(modelState.propertyChanges(animation)); + if (propertyChanges.isValid()) + propertyChanges.modelNode().variantProperty("running").setValue(true); + } } } catch (Exception &e) { m_exceptionError = e.description();