Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: If884b8b8bc087a6a726476b49cdb48a0efaa173e

3 files changed, 17 insertions, 6 deletions

diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index eecd40708..a45139ead 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -213,13 +213,21 @@ void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isE
     Q_UNUSED(errorCode);
     Q_UNUSED(errorDescription);
 
-    if (isErrorPage)
+    if (isErrorPage) {
+        Q_ASSERT(settings->testAttribute(QWebEngineSettings::ErrorPageEnabled));
+        Q_ASSERT(success);
+        Q_EMIT q->loadFinished(false);
         return;
+    }
 
     isLoading = false;
     if (success)
         explicitUrl = QUrl();
-    Q_EMIT q->loadFinished(success);
+    // Delay notifying failure until the error-page is done loading.
+    // Error-pages are not loaded on failures due to abort.
+    if (success || errorCode == -3 /* ERR_ABORTED*/ || !settings->testAttribute(QWebEngineSettings::ErrorPageEnabled)) {
+        Q_EMIT q->loadFinished(success);
+    }
     updateNavigationActions();
 }
 
diff --git a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
index d179e4f2b..624381a42 100644
--- a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
@@ -134,7 +134,8 @@
     through the \c charset attribute of the HTML script tag. Alternatively, the
     encoding can be specified by the web server.
 
-    This is a convenience function equivalent to setContent(html, "text/html", baseUrl).
+    This is a convenience function equivalent to
+    \c{setContent(html, "text/html;charset=UTF-8", baseUrl)}.
 
     \warning This function works only for HTML. For other MIME types (such as XHTML or SVG),
     setContent() should be used instead.
diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
index 90eb0e76e..161983b70 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -86,9 +86,11 @@ RenderWidgetHostViewQtDelegateWidget::RenderWidgetHostViewQtDelegateWidget(Rende
 #endif
 
         // Make sure the OpenGL profile of the QOpenGLWidget matches the shared context profile.
-        format.setMajorVersion(sharedFormat.majorVersion());
-        format.setMinorVersion(sharedFormat.minorVersion());
-        format.setProfile(sharedFormat.profile());
+        if (sharedFormat.profile() == QSurfaceFormat::CoreProfile) {
+            format.setMajorVersion(sharedFormat.majorVersion());
+            format.setMinorVersion(sharedFormat.minorVersion());
+            format.setProfile(sharedFormat.profile());
+        }
     }
 
     setFormat(format);