feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: fix too often deleteLater calls

Browse Source 
Change-Id: Ia1178dc3d25702786d70d6eac8b2e8ea0bde9d7c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
This commit is contained in:
Tim Jenssen
2016-01-20 12:32:14 +01:00
committed by Thomas Hartmann
parent 21a8a969a4
commit 5607b86816
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qmldesigner/qmldesignerextension/colortool/colortool.cpp
View File

@@ -105,6 +105,7 @@ ColorTool::~ColorTool()
void ColorTool::clear() void ColorTool::clear()
{ {
if (m_colorDialog)
m_colorDialog.data()->deleteLater(); m_colorDialog.data()->deleteLater();
AbstractFormEditorTool::clear(); AbstractFormEditorTool::clear();

3
src/plugins/qmldesigner/qmldesignerextension/texttool/texttool.cpp
View File

@@ -109,9 +109,10 @@ TextTool::~TextTool()
void TextTool::clear() void TextTool::clear()
{ {
if (textItem()) if (textItem()) {
textItem()->clearFocus(); textItem()->clearFocus();
textItem()->deleteLater(); textItem()->deleteLater();
}
AbstractFormEditorTool::clear(); AbstractFormEditorTool::clear();
} }