From 5607b86816f3831c2a9be9e1a8bcbcf1ff50702c Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@theqtcompany.com>
Date: Wed, 20 Jan 2016 12:32:14 +0100
Subject: [PATCH] QmlDesigner: fix too often deleteLater calls

Change-Id: Ia1178dc3d25702786d70d6eac8b2e8ea0bde9d7c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
---
 .../qmldesigner/qmldesignerextension/colortool/colortool.cpp | 3 ++-
 .../qmldesigner/qmldesignerextension/texttool/texttool.cpp   | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

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();
 }