diff options
author | Kai Koehne <kai.koehne@nokia.com> | 2010-04-16 17:02:58 +0200 |
---|---|---|
committer | con <qtc-committer@nokia.com> | 2010-04-19 09:27:02 +0200 |
commit | 8e3c9fa10df728fa4da72e63c0ce577bd4674be1 (patch) | |
tree | 24b64bba2385dd8c72912e8ac5ec2abf56444742 | |
parent | 7f1d5a7322d22673a2f4704a42870d914fda2b82 (diff) | |
download | qt-creator-8e3c9fa10df728fa4da72e63c0ce577bd4674be1.tar.gz |
QmlDesigner: Fix crash on exit
QtCreator crashed on exit when the library/navigator/sidebar wasn't
visible in the Design mode. This is caused by a double deletion: The
widgets have the DesignModeWidget as the default parent + the side bar
items try to delete them on exit.
Fixed by removing default parent.
Task-number: QTCREATORBUG-1197
Reviewed-by: Christiaan Janssen
(cherry picked from commit db2fcdb4169dbd0b67f21912beb7878c5bd072a3)
-rw-r--r-- | src/plugins/qmldesigner/designmodewidget.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp index ca22b3e35a..bb216c3deb 100644 --- a/src/plugins/qmldesigner/designmodewidget.cpp +++ b/src/plugins/qmldesigner/designmodewidget.cpp @@ -534,14 +534,15 @@ void DesignModeWidget::setup() } } - m_navigator = new NavigatorView(this); + // Sidebar takes ownership + m_navigator = new NavigatorView; + m_allPropertiesBox = new AllPropertiesBox; + m_itemLibrary = new ItemLibrary; - m_allPropertiesBox = new AllPropertiesBox(this); m_statesEditorWidget = new StatesEditorWidget(this); m_formEditorView = new FormEditorView(this); - m_itemLibrary = new ItemLibrary(this); m_designToolBar = new QToolBar; m_fakeToolBar = Core::EditorManager::createToolBar(this); |