diff --git a/src/plugins/qmldesigner/qmldesignerextension/colortool/colortool.cpp b/src/plugins/qmldesigner/qmldesignerextension/colortool/colortool.cpp index 6904f0fd2b5..a32da93ca90 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/colortool/colortool.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/colortool/colortool.cpp @@ -105,7 +105,8 @@ ColorTool::~ColorTool() void ColorTool::clear() { - m_colorDialog.data()->deleteLater(); + if (m_colorDialog) + m_colorDialog.data()->deleteLater(); AbstractFormEditorTool::clear(); } diff --git a/src/plugins/qmldesigner/qmldesignerextension/texttool/texttool.cpp b/src/plugins/qmldesigner/qmldesignerextension/texttool/texttool.cpp index 891df2f1efb..9e629662221 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/texttool/texttool.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/texttool/texttool.cpp @@ -109,9 +109,10 @@ TextTool::~TextTool() void TextTool::clear() { - if (textItem()) + if (textItem()) { textItem()->clearFocus(); - textItem()->deleteLater(); + textItem()->deleteLater(); + } AbstractFormEditorTool::clear(); }