From 90f472bf590b6fdb3e7f4158ae420002ccbdee17 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 29 Jan 2017 22:56:53 +0100
Subject: [PATCH] Temporary fix for Qt 5.8 segfaults

See #2261
---
 qutebrowser/mainwindow/tabbedbrowser.py | 1 +
 qutebrowser/misc/miscwidgets.py         | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index 6d46abbf8..0cdb5eff9 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -279,6 +279,7 @@ class TabbedBrowser(tabwidget.TabWidget):
             urlutils.invalid_url_error(tab.url(), "saving tab")
         tab.shutdown()
         self.removeTab(idx)
+        tab.layout().unwrap()
         tab.deleteLater()
 
     def undo(self):
diff --git a/qutebrowser/misc/miscwidgets.py b/qutebrowser/misc/miscwidgets.py
index ba21e541a..c08a00946 100644
--- a/qutebrowser/misc/miscwidgets.py
+++ b/qutebrowser/misc/miscwidgets.py
@@ -260,3 +260,7 @@ class WrapperLayout(QLayout):
         self._widget = widget
         container.setFocusProxy(widget)
         widget.setParent(container)
+
+    def unwrap(self):
+        self._widget.setParent(None)
+        self._widget.deleteLater()