diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-04 14:19:35 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-06 14:34:13 +0000 |
commit | 9f5b3d04bb2cecd87e794d9491d97e14e64f0b6d (patch) | |
tree | 50c3cc23d7ada3a2f4edd1ad357b4c741a127f15 /examples/webenginewidgets | |
parent | 06d82e850c1ed0683118af01fe16fac270c1c4e7 (diff) |
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>
Diffstat (limited to 'examples/webenginewidgets')
-rw-r--r-- | examples/webenginewidgets/demobrowser/tabwidget.cpp | 7 | ||||
-rw-r--r-- | examples/webenginewidgets/demobrowser/tabwidget.h | 1 |
2 files changed, 6 insertions, 2 deletions
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); |