summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@qt.io>2018-11-14 08:09:14 +0100
committerChristian Stenger <christian.stenger@qt.io>2018-11-14 07:28:38 +0000
commit1bbac68e5d1bd700450d33671a1444b227dd3f28 (patch)
tree1781615ce15fde31d7943c58248f73ae981d458f
parentaab60ee75cc04cd3ec2544ba8c7d8bd7d894a977 (diff)
downloadqt-creator-1bbac68e5d1bd700450d33671a1444b227dd3f28.tar.gz
Designer: Fix crash on close
...when executing plugin unit tests for Designer. Change-Id: Ic3252bfef4559de4e54f5c3c3fd1984ab6a00f9d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
-rw-r--r--src/plugins/designer/formeditorstack.cpp10
-rw-r--r--src/plugins/designer/formeditorstack.h1
2 files changed, 11 insertions, 0 deletions
diff --git a/src/plugins/designer/formeditorstack.cpp b/src/plugins/designer/formeditorstack.cpp
index 0123c7f820..df602dda46 100644
--- a/src/plugins/designer/formeditorstack.cpp
+++ b/src/plugins/designer/formeditorstack.cpp
@@ -53,6 +53,16 @@ FormEditorStack::FormEditorStack(QWidget *parent) :
setObjectName("FormEditorStack");
}
+FormEditorStack::~FormEditorStack()
+{
+ if (m_designerCore) {
+ if (auto fwm = m_designerCore->formWindowManager()) {
+ disconnect(fwm, &QDesignerFormWindowManagerInterface::activeFormWindowChanged,
+ this, &FormEditorStack::updateFormWindowSelectionHandles);
+ }
+ }
+}
+
void FormEditorStack::add(const EditorData &data)
{
if (m_designerCore == 0) { // Initialize first time here
diff --git a/src/plugins/designer/formeditorstack.h b/src/plugins/designer/formeditorstack.h
index bed1de4d2b..bd82f5cc69 100644
--- a/src/plugins/designer/formeditorstack.h
+++ b/src/plugins/designer/formeditorstack.h
@@ -53,6 +53,7 @@ class FormEditorStack : public QStackedWidget
public:
explicit FormEditorStack(QWidget *parent = nullptr);
+ ~FormEditorStack() override;
void add(const EditorData &d);