aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaj Grönholm <kaj.gronholm@qt.io>2023-09-12 16:41:01 +0300
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2023-09-14 04:37:29 +0000
commit580c91dbb1ed7511397f92f69bb85d90b52411b7 (patch)
tree9d28feb1c08ce7b2019516684fcf761fd21d0f25
parent4bd397d21c75efc7c4028b34896f9a6fd97ecae1 (diff)
Don't assert when Behavior instances are null
Task-number: QTBUG-111570 Change-Id: I16bb1f83977b9ee05f7568f122d5242892592c94 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit e78961400e3a22557f33ab733d0ba4cd3bd4eb8c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 04c63a71ba6740e01fdfb66d38ffa69aea07e8d4)
-rw-r--r--src/quick/util/qquickbehavior.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/util/qquickbehavior.cpp b/src/quick/util/qquickbehavior.cpp
index 95223faca1..31394fcb52 100644
--- a/src/quick/util/qquickbehavior.cpp
+++ b/src/quick/util/qquickbehavior.cpp
@@ -406,7 +406,7 @@ void QQuickBehavior::write(const QVariant &value)
QList<QQmlProperty> after;
auto *newInstance = d->animation->transition(actions, after, QQuickAbstractAnimation::Forward);
- Q_ASSERT(newInstance != d->animationInstance);
+ Q_ASSERT(!newInstance || newInstance != d->animationInstance);
delete d->animationInstance;
d->animationInstance = newInstance;