From daabcbbf7393a5c9eccebc6aa4495e1776d427f9 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Tue, 23 Aug 2022 17:27:30 +0200
Subject: QmlDesigner: Fix crash

isBlocked seems to be called in rare cases if the model is null.

Change-Id: Ie8fa6007a0891f4204c35600084025ca52f079e9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../components/propertyeditor/propertyeditorcontextobject.h  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.h
index f5a2224c8b7..05ebe47ec28 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.h
@@ -28,12 +28,14 @@
 #include <model.h>
 #include <modelnode.h>
 
-#include <QObject>
-#include <QUrl>
-#include <QQmlPropertyMap>
-#include <QQmlComponent>
 #include <QColor>
+#include <QObject>
 #include <QPoint>
+#include <QPointer>
+#include <QQmlComponent>
+#include <QQmlPropertyMap>
+#include <QUrl>
+
 #include <QMouseEvent>
 
 namespace QmlDesigner {
@@ -183,7 +185,7 @@ private:
 
     QPoint m_lastPos;
 
-    Model *m_model = nullptr;
+    QPointer<Model> m_model;
 
     bool m_aliasExport = false;
 
-- 
cgit v1.2.3