Merge branch '5.6' into 5.7

Change-Id: I490e0ee46d3ff040ca26426feb7e4d6ef7098f94

2 files changed, 7 insertions, 4 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();
     }
 }
 
diff --git a/examples/webenginewidgets/simplebrowser/tabwidget.cpp b/examples/webenginewidgets/simplebrowser/tabwidget.cpp
index d9e0dea1b..3c6269f52 100644
--- a/examples/webenginewidgets/simplebrowser/tabwidget.cpp
+++ b/examples/webenginewidgets/simplebrowser/tabwidget.cpp
@@ -180,7 +180,7 @@ void TabWidget::setupView(WebView *webView)
     connect(webView, &QWebEngineView::loadStarted, [this, webView]() {
         int index = indexOf(webView);
         if (index != -1) {
-            QIcon icon(QLatin1String(":loading.gif"));
+            QIcon icon(QLatin1String(":view-refresh.png"));
             setTabIcon(index, icon);
         }
     });