Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	src/core/browser_context_qt.cpp
	src/webengine/api/qquickwebengineview_p.h

Change-Id: I73bdec03b627b282851d7dda12006d4ab631072c

5 files changed, 27 insertions, 20 deletions

diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index 9b0636696..e3ab2ec0d 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -197,7 +197,7 @@ void QWebEnginePagePrivate::titleChanged(const QString &title)
 void QWebEnginePagePrivate::urlChanged(const QUrl &url)
 {
     Q_Q(QWebEnginePage);
-    m_explicitUrl = QUrl();
+    explicitUrl = QUrl();
     Q_EMIT q->urlChanged(url);
 }
 
@@ -257,7 +257,7 @@ void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, int erro
     Q_UNUSED(errorDescription);
     isLoading = false;
     if (success)
-        m_explicitUrl = QUrl();
+        explicitUrl = QUrl();
     Q_EMIT q->loadFinished(success);
     updateNavigationActions();
 }
@@ -333,11 +333,11 @@ void QWebEnginePagePrivate::runMediaAccessPermissionRequest(const QUrl &security
     Q_Q(QWebEnginePage);
     QWebEnginePage::Feature requestedFeature;
     if (requestFlags.testFlag(WebContentsAdapterClient::MediaAudioCapture) && requestFlags.testFlag(WebContentsAdapterClient::MediaVideoCapture))
-        requestedFeature = QWebEnginePage::MediaAudioVideoDevices;
+        requestedFeature = QWebEnginePage::MediaAudioVideoCapture;
     else if (requestFlags.testFlag(WebContentsAdapterClient::MediaAudioCapture))
-        requestedFeature = QWebEnginePage::MediaAudioDevices;
+        requestedFeature = QWebEnginePage::MediaAudioCapture;
     else if (requestFlags.testFlag(WebContentsAdapterClient::MediaVideoCapture))
-        requestedFeature = QWebEnginePage::MediaVideoDevices;
+        requestedFeature = QWebEnginePage::MediaVideoCapture;
     else
         return;
     Q_EMIT q->featurePermissionRequested(securityOrigin, requestedFeature);
@@ -758,16 +758,16 @@ void QWebEnginePage::setFeaturePermission(const QUrl &securityOrigin, QWebEngine
     Q_D(QWebEnginePage);
     WebContentsAdapterClient::MediaRequestFlags flags =  WebContentsAdapterClient::MediaNone;
     switch (feature) {
-    case MediaAudioVideoDevices:
-    case MediaAudioDevices:
-    case MediaVideoDevices:
+    case MediaAudioVideoCapture:
+    case MediaAudioCapture:
+    case MediaVideoCapture:
         if (policy != PermissionUnknown) {
             if (policy == PermissionDeniedByUser)
                 flags = WebContentsAdapterClient::MediaNone;
             else {
-                if (feature == MediaAudioDevices)
+                if (feature == MediaAudioCapture)
                     flags = WebContentsAdapterClient::MediaAudioCapture;
-                else if (feature == MediaVideoDevices)
+                else if (feature == MediaVideoCapture)
                     flags = WebContentsAdapterClient::MediaVideoCapture;
                 else
                     flags = WebContentsAdapterClient::MediaRequestFlags(WebContentsAdapterClient::MediaVideoCapture | WebContentsAdapterClient::MediaAudioCapture);
@@ -838,14 +838,14 @@ QString QWebEnginePage::title() const
 void QWebEnginePage::setUrl(const QUrl &url)
 {
     Q_D(QWebEnginePage);
-    d->m_explicitUrl = url;
+    d->explicitUrl = url;
     load(url);
 }
 
 QUrl QWebEnginePage::url() const
 {
     Q_D(const QWebEnginePage);
-    return d->m_explicitUrl.isValid() ? d->m_explicitUrl : d->adapter->activeUrl();
+    return d->explicitUrl.isValid() ? d->explicitUrl : d->adapter->activeUrl();
 }
 
 QUrl QWebEnginePage::requestedUrl() const
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
index ecd8a5712..afb62ceda 100644
--- a/src/webenginewidgets/api/qwebenginepage.h
+++ b/src/webenginewidgets/api/qwebenginepage.h
@@ -122,7 +122,8 @@ public:
         FindBackward = 1,
         FindCaseSensitively = 2,
     };
-    Q_DECLARE_FLAGS(FindFlags, FindFlag)
+    Q_DECLARE_FLAGS(FindFlags, FindFlag);
+
     enum WebWindowType {
         WebBrowserWindow,
         WebBrowserTab,
@@ -146,12 +147,15 @@ public:
     };
 
     enum Feature {
-        Notifications,
-        Geolocation,
-        MediaAudioDevices,
-        MediaVideoDevices,
-        MediaAudioVideoDevices
+#ifndef Q_QDOC
+        Notifications = 0,
+        Geolocation = 1,
+#endif
+        MediaAudioCapture = 2,
+        MediaVideoCapture,
+        MediaAudioVideoCapture
     };
+
     // Ex-QWebFrame enum
 
     enum FileSelectionMode {
diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
index 57c44cacb..6424c3b0b 100644
--- a/src/webenginewidgets/api/qwebenginepage_p.h
+++ b/src/webenginewidgets/api/qwebenginepage_p.h
@@ -153,7 +153,7 @@ public:
     QWebEngineSettings *settings;
     QWebEngineView *view;
     QSize viewportSize;
-    QUrl m_explicitUrl;
+    QUrl explicitUrl;
     WebEngineContextMenuData m_menuData;
     bool isLoading;
 
diff --git a/src/webenginewidgets/api/qwebenginesettings.cpp b/src/webenginewidgets/api/qwebenginesettings.cpp
index 9ade311fc..729a09f56 100644
--- a/src/webenginewidgets/api/qwebenginesettings.cpp
+++ b/src/webenginewidgets/api/qwebenginesettings.cpp
@@ -67,6 +67,8 @@ static WebEngineSettings::Attribute toWebEngineAttribute(QWebEngineSettings::Web
         return WebEngineSettings::HyperlinkAuditingEnabled;
     case QWebEngineSettings::ScrollAnimatorEnabled:
         return WebEngineSettings::ScrollAnimatorEnabled;
+    case QWebEngineSettings::ErrorPageEnabled:
+        return WebEngineSettings::ErrorPageEnabled;
     default:
         return WebEngineSettings::UnsupportedInCoreSettings;
     }
diff --git a/src/webenginewidgets/api/qwebenginesettings.h b/src/webenginewidgets/api/qwebenginesettings.h
index 68c0a6031..d9f57a935 100644
--- a/src/webenginewidgets/api/qwebenginesettings.h
+++ b/src/webenginewidgets/api/qwebenginesettings.h
@@ -54,7 +54,8 @@ public:
         SpatialNavigationEnabled,
         LocalContentCanAccessFileUrls,
         HyperlinkAuditingEnabled,
-        ScrollAnimatorEnabled
+        ScrollAnimatorEnabled,
+        ErrorPageEnabled
     };
 
     enum FontSize {