From c4babe8c430d009687e3b469240927c417dc7b60 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 29 Aug 2013 12:34:44 +0200 Subject: [PATCH] QmlDesigner: crash fix The assert is wrong. We check the currentModel from QmlDesignerPlugin::hideDesigner() and it can be null in case of a .ui/.qbs file. Change-Id: Ifffa168f81bade757cc8d800150e4411c09915e7 Reviewed-by: Marco Bubke --- .../qmldesigner/components/integration/designdocument.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/plugins/qmldesigner/components/integration/designdocument.cpp b/src/plugins/qmldesigner/components/integration/designdocument.cpp index ba3eb4b57c0..6a402f25c3a 100644 --- a/src/plugins/qmldesigner/components/integration/designdocument.cpp +++ b/src/plugins/qmldesigner/components/integration/designdocument.cpp @@ -83,8 +83,6 @@ DesignDocument::~DesignDocument() Model *DesignDocument::currentModel() const { - Q_ASSERT(m_documentModel); - if (m_inFileComponentModel) return m_inFileComponentModel.data();