Merge remote-tracking branch 'origin/qds/dev'

Change-Id: I8a8692100cbd2429d1952009b73f29d8a374f9bd

1 files changed, 7 insertions, 2 deletions

diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.h
index d4e158fca4..120b7b4abc 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.h
@@ -10,6 +10,8 @@
 #include "qmlmodelnodeproxy.h"
 #include "quick2propertyeditorview.h"
 
+#include <utils/uniqueobjectptr.h>
+
 #include <nodemetainfo.h>
 
 #include <QQmlPropertyMap>
@@ -100,10 +102,13 @@ private:
     static TypeName fixTypeNameForPanes(const TypeName &typeName);
 
 private:
-    Quick2PropertyEditorView *m_view;
+    // to avoid a crash while destructing DesignerPropertyMap in the QQmlData
+    // this needs be destructed after m_quickWidget->engine() is destructed
+    DesignerPropertyMap m_backendValuesPropertyMap;
+
+    Utils::UniqueObjectPtr<Quick2PropertyEditorView> m_view = nullptr;
     QmlAnchorBindingProxy m_backendAnchorBinding;
     QmlModelNodeProxy m_backendModelNode;
-    DesignerPropertyMap m_backendValuesPropertyMap;
     QScopedPointer<PropertyEditorTransaction> m_propertyEditorTransaction;
     QScopedPointer<PropertyEditorValue> m_dummyPropertyEditorValue;
     QScopedPointer<PropertyEditorContextObject> m_contextObject;