summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hartmann <thomas.hartmann@qt.io>2020-02-11 16:54:21 +0100
committerThomas Hartmann <thomas.hartmann@qt.io>2020-02-12 10:46:56 +0000
commitbf0f2ebea0029a82e37bb8085426330b55c6c31c (patch)
tree79c381ca69facdf60dc35529d5772a79ea2ecee2
parent0d9b0f8074b4328cf5ec1141904aeff6a0a2f9f9 (diff)
downloadqt-creator-bf0f2ebea0029a82e37bb8085426330b55c6c31c.tar.gz
QmlDesigner: Fix assert
If in a reaction to auxiliaryDataChanged() we change AuxiliaryData this could trigger cascades and to avoid this we assert. The cascades and assert can be avoided by checking AuxiliaryData before. Change-Id: Id9dd4198041889113fb0e50fdfd4785fddf89f02 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
-rw-r--r--src/plugins/qmldesigner/components/formeditor/formeditorview.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
index 8b4b0dc221..c6e0516e13 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
@@ -661,6 +661,9 @@ void FormEditorView::toggle3DViewEnabled(bool enabled)
QTC_ASSERT(model(), return);
QTC_ASSERT(rootModelNode().isValid(), return);
+ if (enabled == rootModelNode().hasAuxiliaryData("3d-view"))
+ return;
+
if (enabled)
rootModelNode().setAuxiliaryData("3d-view", true);
else