From 86d794320343e58467d34daad8cc9a1b8011a512 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Tue, 23 Jun 2020 17:28:08 +0200
Subject: Re-add segfault workarounds

Some tests (e.g. in test_invocations.py) still seem to segfault without this.
This partially reverts 87d7dd93420ab92a1a209919297371dc0fadcecd.

See #2261
---
 qutebrowser/mainwindow/tabbedbrowser.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index 7323bfff1..db9707eca 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -474,6 +474,12 @@ class TabbedBrowser(QWidget):
 
         tab.private_api.shutdown()
         self.widget.removeTab(idx)
+
+        if not qtutils.version_check('5.12'):
+            # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-58982
+            # Seems to affect Qt 5.7-5.11 as well.
+            tab.layout().unwrap()
+
         tab.deleteLater()
 
     def undo(self):
-- 
cgit v1.2.3-54-g00ecf