diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-18 14:42:00 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-18 14:42:00 +0200 |
commit | ee2b1e71a80f88de90a03e10a89ba491ef99d308 (patch) | |
tree | b14cd541a3f7ad1fc6739e0f5a02d479334b6b34 /examples/webenginewidgets/demobrowser | |
parent | 61bdfb046700068afe36007ede3dcba1104099a3 (diff) | |
parent | 7db354d1a21a17da76244b77c35d7297be3a86a9 (diff) |
Merge branch '5.6' into 5.7
Change-Id: I490e0ee46d3ff040ca26426feb7e4d6ef7098f94
Diffstat (limited to 'examples/webenginewidgets/demobrowser')
-rw-r--r-- | examples/webenginewidgets/demobrowser/tabwidget.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/examples/webenginewidgets/demobrowser/tabwidget.cpp b/examples/webenginewidgets/demobrowser/tabwidget.cpp index 68d0c727c..3b56d115b 100644 --- a/examples/webenginewidgets/demobrowser/tabwidget.cpp +++ b/examples/webenginewidgets/demobrowser/tabwidget.cpp @@ -441,9 +441,12 @@ void TabWidget::fullScreenRequested(QWebEngineFullScreenRequest request) WebView *oldWebView = this->webView(m_lineEdits->currentIndex()); webPage->setView(oldWebView); request.accept(); - raise(); - m_fullScreenView->hide(); - m_fullScreenNotification->hide(); + // Change the delete and window hide/show back to a simple m_fullScreenView->hide() + // once QTBUG-46701 gets fixed. + delete m_fullScreenView; + m_fullScreenView = 0; + window()->hide(); + window()->show(); } } |