From d690882b676c4df2236dfbff42c5aa767bd71595 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Mon, 25 Nov 2019 10:04:55 +0100 Subject: [PATCH] Avoid explicit deletion of preview window: this crashes on the mac. Use deleteonclose flag instead --- src/qtgui/preview_w.cpp | 2 ++ src/qtgui/rclm_preview.cpp | 1 - src/qtgui/snippets_w.cpp | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qtgui/preview_w.cpp b/src/qtgui/preview_w.cpp index 4e493833..3d1f98f5 100644 --- a/src/qtgui/preview_w.cpp +++ b/src/qtgui/preview_w.cpp @@ -99,6 +99,8 @@ static void trimwildcards(string& elt) void Preview::init() { LOGDEB("Preview::init\n"); + setAttribute(Qt::WA_DeleteOnClose); + // Create the first tab (the tab widget is created with one // initial tab for ease of use in designer, we remove it). addEditorTab(); diff --git a/src/qtgui/rclm_preview.cpp b/src/qtgui/rclm_preview.cpp index c7513078..1f3e9571 100644 --- a/src/qtgui/rclm_preview.cpp +++ b/src/qtgui/rclm_preview.cpp @@ -38,7 +38,6 @@ void RclMain::previewClosed(Preview *w) } else { LOGDEB("Old preview closed\n"); } - delete w; } // Document up to date check. The main problem we try to solve is diff --git a/src/qtgui/snippets_w.cpp b/src/qtgui/snippets_w.cpp index db1c5054..2813441d 100644 --- a/src/qtgui/snippets_w.cpp +++ b/src/qtgui/snippets_w.cpp @@ -104,6 +104,7 @@ void SnippetsW::init() connect(prevPB, SIGNAL(clicked()), this, SLOT(slotEditFindPrevious())); + // Get rid of the placeholder widget created from the .ui delete browserw; #if defined(USING_WEBKIT) browserw = new QWebView(this);