From 9f5b3d04bb2cecd87e794d9491d97e14e64f0b6d Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Fri, 4 Sep 2015 14:19:35 +0200
Subject: Fix crash on exiting fullscreen

Reuse the fullscreen view and avoid deleting it synchronously.

Change-Id: I05642fb29507e6bbc6e6443c94deec35ccb83440
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
---
 examples/webenginewidgets/demobrowser/tabwidget.cpp | 7 +++++--
 examples/webenginewidgets/demobrowser/tabwidget.h   | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'examples/webenginewidgets')

diff --git a/examples/webenginewidgets/demobrowser/tabwidget.cpp b/examples/webenginewidgets/demobrowser/tabwidget.cpp
index 7d6b1e793..4532683b5 100644
--- a/examples/webenginewidgets/demobrowser/tabwidget.cpp
+++ b/examples/webenginewidgets/demobrowser/tabwidget.cpp
@@ -85,6 +85,11 @@ TabBar::TabBar(QWidget *parent)
     setMovable(true);
 }
 
+TabWidget::~TabWidget()
+{
+    delete m_fullScreenView;
+}
+
 void TabBar::selectTabAction()
 {
     if (QShortcut *shortCut = qobject_cast<QShortcut*>(sender())) {
@@ -364,8 +369,6 @@ void TabWidget::fullScreenRequested(bool fullscreen)
         webPage->setView(oldWebView);
         raise();
         m_fullScreenView->hide();
-        delete m_fullScreenView;
-        m_fullScreenView = 0;
     }
 }
 
diff --git a/examples/webenginewidgets/demobrowser/tabwidget.h b/examples/webenginewidgets/demobrowser/tabwidget.h
index 66ab1ab0f..f6c4edba2 100644
--- a/examples/webenginewidgets/demobrowser/tabwidget.h
+++ b/examples/webenginewidgets/demobrowser/tabwidget.h
@@ -165,6 +165,7 @@ signals:
 
 public:
     TabWidget(QWidget *parent = 0);
+    ~TabWidget();
     void clear();
     void addWebAction(QAction *action, QWebEnginePage::WebAction webAction);
 
-- 
cgit v1.2.3