Merge branch '5.5' into 5.6

Change-Id: I9977663123560a22f493b8c02d02de8897b38666

69 files changed, 645 insertions, 220 deletions

diff --git a/src/core/certificate_error_controller_p.h b/src/core/certificate_error_controller_p.h
index 505e77905..08b51f30f 100644
--- a/src/core/certificate_error_controller_p.h
+++ b/src/core/certificate_error_controller_p.h
@@ -37,6 +37,17 @@
 #ifndef CERTIFICATE_ERROR_CONTROLLER_P_H
 #define CERTIFICATE_ERROR_CONTROLLER_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "content/public/browser/content_browser_client.h"
 
 #include "certificate_error_controller.h"
diff --git a/src/core/clipboard_qt.cpp b/src/core/clipboard_qt.cpp
index 85235acce..206392840 100644
--- a/src/core/clipboard_qt.cpp
+++ b/src/core/clipboard_qt.cpp
@@ -208,7 +208,7 @@ void ClipboardQt::WriteObjects(ui::ClipboardType type, const ObjectMap& objects)
     if (uncommittedData)
         QGuiApplication::clipboard()->setMimeData(uncommittedData.take(), type == ui::CLIPBOARD_TYPE_COPY_PASTE ? QClipboard::Clipboard : QClipboard::Selection);
 
-    if (type == ui::CLIPBOARD_TYPE_COPY_PASTE) {
+    if (type == ui::CLIPBOARD_TYPE_COPY_PASTE && IsSupportedClipboardType(ui::CLIPBOARD_TYPE_SELECTION)) {
         ObjectMap::const_iterator text_iter = objects.find(CBF_TEXT);
         if (text_iter != objects.end()) {
             // Copy text and SourceTag to the selection clipboard.
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index a8cb54c0c..91cd0b0c4 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -72,6 +72,7 @@
 #include "resource_dispatcher_host_delegate_qt.h"
 #include "user_script_controller_host.h"
 #include "web_contents_delegate_qt.h"
+#include "web_engine_context.h"
 #include "web_engine_library_info.h"
 
 #if defined(ENABLE_PLUGINS)
@@ -225,6 +226,9 @@ public:
 
     void PostMainMessageLoopRun()
     {
+        // The BrowserContext's destructor uses the MessageLoop so it should be deleted
+        // right before the RenderProcessHostImpl's destructor destroys it.
+        WebEngineContext::current()->destroyBrowserContext();
     }
 
     int PreCreateThreads() Q_DECL_OVERRIDE
diff --git a/src/core/core_module.pro b/src/core/core_module.pro
index dafeb0b36..291aac916 100644
--- a/src/core/core_module.pro
+++ b/src/core/core_module.pro
@@ -45,7 +45,9 @@ LOCALE_LIST = am ar bg bn ca cs da de el en-GB en-US es-419 es et fa fi fil fr g
 for(LOC, LOCALE_LIST) {
     locales.files += $$REPACK_DIR/qtwebengine_locales/$${LOC}.pak
 }
-resources.files = $$REPACK_DIR/qtwebengine_resources.pak
+resources.files = $$REPACK_DIR/qtwebengine_resources.pak \
+    $$REPACK_DIR/qtwebengine_resources_100p.pak \
+    $$REPACK_DIR/qtwebengine_resources_200p.pak
 
 icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat
 
diff --git a/src/core/custom_protocol_handler.cpp b/src/core/custom_protocol_handler.cpp
index 5deadf185..f140f98cf 100644
--- a/src/core/custom_protocol_handler.cpp
+++ b/src/core/custom_protocol_handler.cpp
@@ -10,15 +10,15 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
 ** General Public License version 3 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file.  Please review the following information to
+** packaging of this file. Please review the following information to
 ** ensure the GNU Lesser General Public License version 3 requirements
 ** will be met: https://www.gnu.org/licenses/lgpl.html.
 **
@@ -26,7 +26,7 @@
 ** Alternatively, this file may be used under the terms of the GNU
 ** General Public License version 2.0 or later as published by the Free
 ** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file.  Please review the following information to
+** the packaging of this file. Please review the following information to
 ** ensure the GNU General Public License version 2.0 requirements will be
 ** met: http://www.gnu.org/licenses/gpl-2.0.html.
 **
diff --git a/src/core/custom_protocol_handler.h b/src/core/custom_protocol_handler.h
index 923cac79d..225bb0567 100644
--- a/src/core/custom_protocol_handler.h
+++ b/src/core/custom_protocol_handler.h
@@ -10,15 +10,15 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
 ** General Public License version 3 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file.  Please review the following information to
+** packaging of this file. Please review the following information to
 ** ensure the GNU Lesser General Public License version 3 requirements
 ** will be met: https://www.gnu.org/licenses/lgpl.html.
 **
@@ -26,7 +26,7 @@
 ** Alternatively, this file may be used under the terms of the GNU
 ** General Public License version 2.0 or later as published by the Free
 ** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file.  Please review the following information to
+** the packaging of this file. Please review the following information to
 ** ensure the GNU General Public License version 2.0 requirements will be
 ** met: http://www.gnu.org/licenses/gpl-2.0.html.
 **
diff --git a/src/core/custom_url_scheme_handler.cpp b/src/core/custom_url_scheme_handler.cpp
index 591cad32e..b9fcf9c36 100644
--- a/src/core/custom_url_scheme_handler.cpp
+++ b/src/core/custom_url_scheme_handler.cpp
@@ -10,15 +10,15 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
 ** General Public License version 3 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file.  Please review the following information to
+** packaging of this file. Please review the following information to
 ** ensure the GNU Lesser General Public License version 3 requirements
 ** will be met: https://www.gnu.org/licenses/lgpl.html.
 **
@@ -26,7 +26,7 @@
 ** Alternatively, this file may be used under the terms of the GNU
 ** General Public License version 2.0 or later as published by the Free
 ** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file.  Please review the following information to
+** the packaging of this file. Please review the following information to
 ** ensure the GNU General Public License version 2.0 requirements will be
 ** met: http://www.gnu.org/licenses/gpl-2.0.html.
 **
diff --git a/src/core/custom_url_scheme_handler.h b/src/core/custom_url_scheme_handler.h
index 0079095d8..745f0eb4c 100644
--- a/src/core/custom_url_scheme_handler.h
+++ b/src/core/custom_url_scheme_handler.h
@@ -10,15 +10,15 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
 ** General Public License version 3 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file.  Please review the following information to
+** packaging of this file. Please review the following information to
 ** ensure the GNU Lesser General Public License version 3 requirements
 ** will be met: https://www.gnu.org/licenses/lgpl.html.
 **
@@ -26,7 +26,7 @@
 ** Alternatively, this file may be used under the terms of the GNU
 ** General Public License version 2.0 or later as published by the Free
 ** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file.  Please review the following information to
+** the packaging of this file. Please review the following information to
 ** ensure the GNU General Public License version 2.0 requirements will be
 ** met: http://www.gnu.org/licenses/gpl-2.0.html.
 **
diff --git a/src/core/gl_context_qt.cpp b/src/core/gl_context_qt.cpp
index baccddc9d..b350c3c5b 100644
--- a/src/core/gl_context_qt.cpp
+++ b/src/core/gl_context_qt.cpp
@@ -60,7 +60,11 @@ namespace {
 
 inline void *resourceForContext(const QByteArray &resource)
 {
-    return qApp->platformNativeInterface()->nativeResourceForContext(resource, qt_gl_global_share_context());
+    QOpenGLContext *shareContext = qt_gl_global_share_context();
+    if (!shareContext) {
+        qFatal("QWebEngine: OpenGL resource sharing is not set up in QtQuick. Please make sure to call QtWebEngine::initialize() in your main() function.");
+    }
+    return qApp->platformNativeInterface()->nativeResourceForContext(resource, shareContext);
 }
 
 inline void *resourceForIntegration(const QByteArray &resource)
diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp
index 19ce59f7e..c905688ce 100644
--- a/src/core/gl_surface_qt.cpp
+++ b/src/core/gl_surface_qt.cpp
@@ -324,13 +324,7 @@ bool GLSurfaceQtEGL::InitializeOneOff()
     if (initialized)
         return true;
 
-#if defined(USE_X11)
-    EGLNativeDisplayType nativeDisplay = reinterpret_cast<EGLNativeDisplayType>(GLContextHelper::getXDisplay());
-    g_display = eglGetDisplay(nativeDisplay);
-#else
     g_display = GLContextHelper::getEGLDisplay();
-#endif
-
     if (!g_display) {
         LOG(ERROR) << "GLContextHelper::getEGLDisplay() failed.";
         return false;
diff --git a/src/core/javascript_dialog_controller_p.h b/src/core/javascript_dialog_controller_p.h
index 504c5783e..5c3bd39f5 100644
--- a/src/core/javascript_dialog_controller_p.h
+++ b/src/core/javascript_dialog_controller_p.h
@@ -37,6 +37,17 @@
 #ifndef JAVASCRIPT_DIALOG_CONTROLLER_P_H
 #define JAVASCRIPT_DIALOG_CONTROLLER_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "content/public/browser/javascript_dialog_manager.h"
 #include "web_contents_adapter_client.h"
 #include <QString>
diff --git a/src/core/qtwebengine.gypi b/src/core/qtwebengine.gypi
index 2c433f614..cad6882eb 100644
--- a/src/core/qtwebengine.gypi
+++ b/src/core/qtwebengine.gypi
@@ -26,6 +26,7 @@
       '<(chromium_src_dir)/media/media.gyp:media',
       '<(chromium_src_dir)/net/net.gyp:net',
       '<(chromium_src_dir)/net/net.gyp:net_resources',
+      '<(chromium_src_dir)/net/net.gyp:net_with_v8',
       '<(chromium_src_dir)/skia/skia.gyp:skia',
       '<(chromium_src_dir)/third_party/WebKit/Source/web/web.gyp:blink_web',
       '<(chromium_src_dir)/ui/base/ui_base.gyp:ui_base',
@@ -47,6 +48,9 @@
       'CHROMIUM_VERSION=\"<!(python <(version_script_location) -f <(chromium_src_dir)/chrome/VERSION -t "@MAJOR@.@MINOR@.@BUILD@.@PATCH@")\"',
     ],
     'msvs_settings': {
+      'VCCLCompilerTool': {
+        'RuntimeTypeInfo': 'true',
+      },
       'VCLinkerTool': {
         'SubSystem': '2',  # Set /SUBSYSTEM:WINDOWS
       },
@@ -81,6 +85,11 @@
           },
         },
       }],
+      ['qt_os=="win32" and qt_gl=="opengl"', {
+        'include_dirs': [
+          '<(chromium_src_dir)/third_party/khronos',
+        ],
+      }],
       ['OS=="win"', {
         'resource_include_dirs': [
           '<(SHARED_INTERMEDIATE_DIR)/webkit',
diff --git a/src/core/resource_bundle_qt.cpp b/src/core/resource_bundle_qt.cpp
index 3e9c6ad43..932f40af8 100644
--- a/src/core/resource_bundle_qt.cpp
+++ b/src/core/resource_bundle_qt.cpp
@@ -44,7 +44,9 @@ namespace ui {
 void ResourceBundle::LoadCommonResources()
 {
     // We repacked the resources we need and installed them. now let chromium mmap that file.
-    AddDataPackFromPath(WebEngineLibraryInfo::getPath(QT_RESOURCES_PAK), SCALE_FACTOR_100P);
+    AddDataPackFromPath(WebEngineLibraryInfo::getPath(QT_RESOURCES_PAK), SCALE_FACTOR_NONE);
+    AddDataPackFromPath(WebEngineLibraryInfo::getPath(QT_RESOURCES_100P_PAK), SCALE_FACTOR_100P);
+    AddDataPackFromPath(WebEngineLibraryInfo::getPath(QT_RESOURCES_200P_PAK), SCALE_FACTOR_200P);
 }
 
 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl)
diff --git a/src/core/resources/repack_resources.gypi b/src/core/resources/repack_resources.gypi
index fdf317a7c..ce224e625 100644
--- a/src/core/resources/repack_resources.gypi
+++ b/src/core/resources/repack_resources.gypi
@@ -4,23 +4,13 @@
 {
   'variables': {
     'repack_path': '<(chromium_src_dir)/tools/grit/grit/format/repack.py',
-    'pak_inputs': [
-      '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
-      '<(SHARED_INTERMEDIATE_DIR)/blink/devtools_resources.pak',
-      '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
-      '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
-      '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
-      '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_100_percent.pak',
-      '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
-      '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources_100_percent.pak',
-    ],
   },
   'inputs': [
     '<(repack_path)',
     '<@(pak_inputs)',
   ],
   'outputs': [
-    '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_resources.pak',
+    '<@(pak_outputs)',
   ],
   'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
 }
diff --git a/src/core/resources/resources.gyp b/src/core/resources/resources.gyp
index 5d4d83c05..6293cdf3b 100644
--- a/src/core/resources/resources.gyp
+++ b/src/core/resources/resources.gyp
@@ -15,7 +15,7 @@
   },
   'dependencies': [
       '<(chromium_src_dir)/content/app/strings/content_strings.gyp:content_strings',
-      '<(chromium_src_dir)/webkit/blink_resources.gyp:blink_resources',
+      '<(chromium_src_dir)/blink/public/blink_resources.gyp:blink_resources',
       '<(chromium_src_dir)/content/browser/devtools/devtools_resources.gyp:devtools_resources',
       '../chrome_qt.gyp:chrome_resources',
   ],
@@ -26,6 +26,46 @@
     'actions' : [
       {
         'action_name': 'repack_resources',
+        'variables': {
+            'pak_inputs': [
+              '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/blink/devtools_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
+            ],
+            'pak_outputs': [
+                '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_resources.pak'
+            ]
+        },
+        'includes': [ 'repack_resources.gypi' ],
+      },
+      {
+        'action_name': 'repack_resources_100_percent',
+        'variables': {
+            'pak_inputs': [
+              '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_100_percent.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources_100_percent.pak',
+            ],
+            'pak_outputs': [
+                '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_resources_100p.pak'
+            ]
+        },
+        'includes': [ 'repack_resources.gypi' ],
+      },
+      {
+        'action_name': 'repack_resources_200_percent',
+        'variables': {
+            'pak_inputs': [
+              '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_200_percent.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_200_percent.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources_200_percent.pak',
+            ],
+            'pak_outputs': [
+                '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_resources_200p.pak'
+            ]
+        },
         'includes': [ 'repack_resources.gypi' ],
       },
       {
@@ -40,7 +80,15 @@
             'destination': '<(qt_install_data)',
             'files': [ '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_resources.pak' ],
           },
-        ],
+          {
+            'destination': '<(qt_install_data)',
+            'files': [ '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_resources_100p.pak' ],
+          },
+          {
+            'destination': '<(qt_install_data)',
+            'files': [ '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_resources_200p.pak' ],
+          },
+          ],
       }],
       ['qt_install_translations != ""', {
         'copies': [
diff --git a/src/core/surface_factory_qt.cpp b/src/core/surface_factory_qt.cpp
index 40c65d9d3..db10be070 100644
--- a/src/core/surface_factory_qt.cpp
+++ b/src/core/surface_factory_qt.cpp
@@ -71,13 +71,13 @@ base::NativeLibrary LoadLibrary(const base::FilePath& filename) {
 bool SurfaceFactoryQt::LoadEGLGLES2Bindings(AddGLLibraryCallback add_gl_library, SetGLGetProcAddressProcCallback set_gl_get_proc_address)
 {
     base::FilePath libEGLPath = QtWebEngineCore::toFilePath(QT_LIBDIR_EGL);
-    libEGLPath = libEGLPath.Append("libEGL.so");
+    libEGLPath = libEGLPath.Append("libEGL.so.1");
     base::NativeLibrary eglLibrary = LoadLibrary(libEGLPath);
     if (!eglLibrary)
         return false;
 
     base::FilePath libGLES2Path = QtWebEngineCore::toFilePath(QT_LIBDIR_GLES2);
-    libGLES2Path = libGLES2Path.Append("libGLESv2.so");
+    libGLES2Path = libGLES2Path.Append("libGLESv2.so.2");
     base::NativeLibrary gles2Library = LoadLibrary(libGLES2Path);
     if (!gles2Library)
         return false;
diff --git a/src/core/url_request_context_getter_qt.cpp b/src/core/url_request_context_getter_qt.cpp
index 0eb5163f9..a50fcbe0e 100644
--- a/src/core/url_request_context_getter_qt.cpp
+++ b/src/core/url_request_context_getter_qt.cpp
@@ -36,11 +36,13 @@
 
 #include "url_request_context_getter_qt.h"
 
+#include "base/command_line.h"
 #include "base/strings/string_util.h"
 #include "base/threading/worker_pool.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cookie_store_factory.h"
+#include "content/public/common/content_switches.h"
 #include "net/base/cache_type.h"
 #include "net/cert/cert_verifier.h"
 #include "net/dns/host_resolver.h"
@@ -49,7 +51,11 @@
 #include "net/http/http_cache.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_server_properties_impl.h"
+#include "net/proxy/dhcp_proxy_script_fetcher_factory.h"
+#include "net/proxy/proxy_script_fetcher_impl.h"
 #include "net/proxy/proxy_service.h"
+#include "net/proxy/proxy_service_v8.h"
+#include "net/proxy/proxy_resolver_v8.h"
 #include "net/ssl/channel_id_service.h"
 #include "net/ssl/default_channel_id_store.h"
 #include "net/ssl/ssl_config_service_defaults.h"
@@ -154,17 +160,29 @@ void URLRequestContextGetterQt::generateStorage()
         base::WorkerPool::GetTaskRunner(true))));
 
     m_storage->set_cert_verifier(net::CertVerifier::CreateDefault());
-    net::ProxyService *proxyService = nullptr;
+
+    scoped_ptr<net::HostResolver> host_resolver(net::HostResolver::CreateDefaultResolver(NULL));
+
+    // The System Proxy Resolver has issues on Windows with unconfigured network cards,
+    // which is why we want to use the v8 one
     if (ProxyResolverQt::useProxyResolverQt()) {
         scoped_ptr<ProxyResolverFactoryQt> factory(new ProxyResolverFactoryQt(false));
-        proxyService = new net::ProxyService(proxyConfigService, factory.Pass(), nullptr);
-    } else
-        proxyService = net::ProxyService::CreateUsingSystemProxyResolver(proxyConfigService, /*num_pac_threads = */0 /*default*/, NULL);
-    m_storage->set_proxy_service(proxyService);
+        m_storage->set_proxy_service(new net::ProxyService(proxyConfigService, factory.Pass(), nullptr));
+    } else {
+        if (!m_dhcpProxyScriptFetcherFactory)
+            m_dhcpProxyScriptFetcherFactory.reset(new net::DhcpProxyScriptFetcherFactory);
+
+        m_storage->set_proxy_service(net::CreateProxyServiceUsingV8ProxyResolver(
+                                         proxyConfigService,
+                                         new net::ProxyScriptFetcherImpl(m_urlRequestContext.get()),
+                                         m_dhcpProxyScriptFetcherFactory->Create(m_urlRequestContext.get()),
+                                         host_resolver.get(),
+                                         NULL /* NetLog */,
+                                         m_networkDelegate.get()));
+    }
     m_storage->set_ssl_config_service(new net::SSLConfigServiceDefaults);
     m_storage->set_transport_security_state(new net::TransportSecurityState());
 
-    scoped_ptr<net::HostResolver> host_resolver(net::HostResolver::CreateDefaultResolver(NULL));
     m_storage->set_http_auth_handler_factory(net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get()));
     m_storage->set_http_server_properties(scoped_ptr<net::HttpServerProperties>(new net::HttpServerPropertiesImpl));
 
diff --git a/src/core/url_request_context_getter_qt.h b/src/core/url_request_context_getter_qt.h
index be9567f4b..c7a4366ec 100644
--- a/src/core/url_request_context_getter_qt.h
+++ b/src/core/url_request_context_getter_qt.h
@@ -47,6 +47,7 @@
 #include "content/public/common/url_constants.h"
 #include "net/url_request/url_request_context_storage.h"
 #include "net/url_request/url_request_job_factory_impl.h"
+#include "net/proxy/dhcp_proxy_script_fetcher_factory.h"
 
 #include "cookie_monster_delegate_qt.h"
 #include "network_delegate_qt.h"
@@ -97,7 +98,7 @@ private:
     scoped_ptr<NetworkDelegateQt> m_networkDelegate;
     scoped_ptr<net::URLRequestContextStorage> m_storage;
     scoped_ptr<net::URLRequestJobFactoryImpl> m_jobFactory;
-
+    scoped_ptr<net::DhcpProxyScriptFetcherFactory> m_dhcpProxyScriptFetcherFactory;
     scoped_refptr<CookieMonsterDelegateQt> m_cookieDelegate;
     friend class NetworkDelegateQt;
 };
diff --git a/src/core/url_request_custom_job.cpp b/src/core/url_request_custom_job.cpp
index cd71b6900..afdcecdfe 100644
--- a/src/core/url_request_custom_job.cpp
+++ b/src/core/url_request_custom_job.cpp
@@ -10,15 +10,15 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
 ** General Public License version 3 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file.  Please review the following information to
+** packaging of this file. Please review the following information to
 ** ensure the GNU Lesser General Public License version 3 requirements
 ** will be met: https://www.gnu.org/licenses/lgpl.html.
 **
@@ -26,7 +26,7 @@
 ** Alternatively, this file may be used under the terms of the GNU
 ** General Public License version 2.0 or later as published by the Free
 ** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file.  Please review the following information to
+** the packaging of this file. Please review the following information to
 ** ensure the GNU General Public License version 2.0 requirements will be
 ** met: http://www.gnu.org/licenses/gpl-2.0.html.
 **
diff --git a/src/core/url_request_custom_job.h b/src/core/url_request_custom_job.h
index 4975e71d2..60a1d60b9 100644
--- a/src/core/url_request_custom_job.h
+++ b/src/core/url_request_custom_job.h
@@ -10,15 +10,15 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
 ** General Public License version 3 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file.  Please review the following information to
+** packaging of this file. Please review the following information to
 ** ensure the GNU Lesser General Public License version 3 requirements
 ** will be met: https://www.gnu.org/licenses/lgpl.html.
 **
@@ -26,7 +26,7 @@
 ** Alternatively, this file may be used under the terms of the GNU
 ** General Public License version 2.0 or later as published by the Free
 ** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file.  Please review the following information to
+** the packaging of this file. Please review the following information to
 ** ensure the GNU General Public License version 2.0 requirements will be
 ** met: http://www.gnu.org/licenses/gpl-2.0.html.
 **
diff --git a/src/core/url_request_custom_job_delegate.cpp b/src/core/url_request_custom_job_delegate.cpp
index caf7a0e3e..8d344c862 100644
--- a/src/core/url_request_custom_job_delegate.cpp
+++ b/src/core/url_request_custom_job_delegate.cpp
@@ -10,15 +10,15 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
 ** General Public License version 3 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file.  Please review the following information to
+** packaging of this file. Please review the following information to
 ** ensure the GNU Lesser General Public License version 3 requirements
 ** will be met: https://www.gnu.org/licenses/lgpl.html.
 **
@@ -26,7 +26,7 @@
 ** Alternatively, this file may be used under the terms of the GNU
 ** General Public License version 2.0 or later as published by the Free
 ** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file.  Please review the following information to
+** the packaging of this file. Please review the following information to
 ** ensure the GNU General Public License version 2.0 requirements will be
 ** met: http://www.gnu.org/licenses/gpl-2.0.html.
 **
diff --git a/src/core/url_request_custom_job_delegate.h b/src/core/url_request_custom_job_delegate.h
index 580149ecf..6c1600592 100644
--- a/src/core/url_request_custom_job_delegate.h
+++ b/src/core/url_request_custom_job_delegate.h
@@ -10,15 +10,15 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
 ** General Public License version 3 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file.  Please review the following information to
+** packaging of this file. Please review the following information to
 ** ensure the GNU Lesser General Public License version 3 requirements
 ** will be met: https://www.gnu.org/licenses/lgpl.html.
 **
@@ -26,7 +26,7 @@
 ** Alternatively, this file may be used under the terms of the GNU
 ** General Public License version 2.0 or later as published by the Free
 ** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file.  Please review the following information to
+** the packaging of this file. Please review the following information to
 ** ensure the GNU General Public License version 2.0 requirements will be
 ** met: http://www.gnu.org/licenses/gpl-2.0.html.
 **
diff --git a/src/core/web_contents_adapter_p.h b/src/core/web_contents_adapter_p.h
index 52bade3a5..505f803b2 100644
--- a/src/core/web_contents_adapter_p.h
+++ b/src/core/web_contents_adapter_p.h
@@ -37,6 +37,17 @@
 #ifndef WEB_CONTENTS_ADAPTER_P_H
 #define WEB_CONTENTS_ADAPTER_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "web_contents_adapter.h"
 
 #include "base/memory/ref_counted.h"
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index db4cec1fc..727cfb491 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -91,6 +91,10 @@ scoped_refptr<WebEngineContext> sContext;
 
 void destroyContext()
 {
+    // Destroy WebEngineContext before its static pointer is zeroed and destructor called.
+    // Before destroying MessageLoop via destroying BrowserMainRunner destructor
+    // WebEngineContext's pointer is used.
+    sContext->destroy();
     sContext = 0;
 }
 
@@ -136,9 +140,13 @@ bool usingQtQuick2DRenderer()
 
 } // namespace
 
-WebEngineContext::~WebEngineContext()
+void WebEngineContext::destroyBrowserContext()
 {
     m_defaultBrowserContext = 0;
+}
+
+void WebEngineContext::destroy()
+{
     delete m_globalQObject;
     m_globalQObject = 0;
     base::MessagePump::Delegate *delegate = m_runLoop->loop_;
@@ -146,6 +154,15 @@ WebEngineContext::~WebEngineContext()
     while (delegate->DoWork()) { }
     GLContextHelper::destroy();
     m_runLoop->AfterRun();
+
+    // Force to destroy RenderProcessHostImpl by destroying BrowserMainRunner.
+    // RenderProcessHostImpl should be destroyed before WebEngineContext since
+    // default BrowserContext might be used by the RenderprocessHostImpl's destructor.
+    m_browserRunner.reset(0);
+}
+
+WebEngineContext::~WebEngineContext()
+{
 }
 
 scoped_refptr<WebEngineContext> WebEngineContext::current()
diff --git a/src/core/web_engine_context.h b/src/core/web_engine_context.h
index f78791f27..8f034f18f 100644
--- a/src/core/web_engine_context.h
+++ b/src/core/web_engine_context.h
@@ -71,6 +71,9 @@ public:
     QtWebEngineCore::BrowserContextAdapter *defaultBrowserContext();
     QObject *globalQObject();
 
+    void destroyBrowserContext();
+    void destroy();
+
 private:
     friend class base::RefCounted<WebEngineContext>;
     WebEngineContext();
diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp
index 69fa418c6..bc030d8f7 100644
--- a/src/core/web_engine_library_info.cpp
+++ b/src/core/web_engine_library_info.cpp
@@ -112,54 +112,71 @@ static QString getResourcesPath(CFBundleRef frameworkBundle)
 
 QString subProcessPath()
 {
-    static bool initialized = false;
+    static QString processPath;
+    if (processPath.isEmpty()) {
 #if defined(OS_WIN)
-    static QString processBinary (QLatin1String(QTWEBENGINEPROCESS_NAME) % QLatin1String(".exe"));
+        const QString processBinary = QLatin1String(QTWEBENGINEPROCESS_NAME) % QLatin1String(".exe");
 #else
-    static QString processBinary (QLatin1String(QTWEBENGINEPROCESS_NAME));
+        const QString processBinary = QLatin1String(QTWEBENGINEPROCESS_NAME);
 #endif
+
+        QStringList candidatePaths;
+        const QByteArray fromEnv = qgetenv("QTWEBENGINEPROCESS_PATH");
+        if (!fromEnv.isEmpty()) {
+            // Only search in QTWEBENGINEPROCESS_PATH if set
+            candidatePaths << QString::fromLocal8Bit(fromEnv);
+        } else {
 #if defined(OS_MACOSX) && defined(QT_MAC_FRAMEWORK_BUILD)
-    static QString processPath (getPath(frameworkBundle())
-                                % QStringLiteral("/Helpers/" QTWEBENGINEPROCESS_NAME ".app/Contents/MacOS/" QTWEBENGINEPROCESS_NAME));
+            candidatePaths << getPath(frameworkBundle())
+                              % QStringLiteral("/Helpers/" QTWEBENGINEPROCESS_NAME ".app/Contents/MacOS/" QTWEBENGINEPROCESS_NAME);
 #else
-    static QString processPath (QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath)
-                                % QLatin1Char('/') % processBinary);
+            candidatePaths << QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath)
+                              % QLatin1Char('/') % processBinary;
+            candidatePaths << QCoreApplication::applicationDirPath()
+                              % QLatin1Char('/') % processBinary;
 #endif
-    if (!initialized) {
-        // Allow overriding at runtime for the time being.
-        const QByteArray fromEnv = qgetenv("QTWEBENGINEPROCESS_PATH");
-        if (!fromEnv.isEmpty())
-            processPath = QString::fromLatin1(fromEnv);
-        if (!QFileInfo(processPath).exists()) {
-            qWarning("QtWebEngineProcess not found at location %s. Trying fallback path...", qPrintable(processPath));
-            processPath = QCoreApplication::applicationDirPath() % QLatin1Char('/') % processBinary;
         }
-        if (!QFileInfo(processPath).exists())
-            qFatal("QtWebEngineProcess not found at location %s. Try setting the QTWEBENGINEPROCESS_PATH environment variable.", qPrintable(processPath));
-        initialized = true;
+
+        Q_FOREACH (const QString &candidate, candidatePaths) {
+            if (QFileInfo(candidate).exists()) {
+                processPath = candidate;
+                break;
+            }
+        }
+        if (processPath.isEmpty())
+            qFatal("Could not find %s", processBinary.toUtf8().constData());
+
     }
 
+
     return processPath;
 }
 
 QString pluginsPath()
 {
 #if defined(OS_MACOSX) && defined(QT_MAC_FRAMEWORK_BUILD)
-    return getPath(frameworkBundle()) % QLatin1String("/Libraries");
+    static QString pluginsPath = getPath(frameworkBundle()) % QLatin1String("/Libraries");
 #else
     static bool initialized = false;
-    static QString potentialPluginsPath = QLibraryInfo::location(QLibraryInfo::PluginsPath) % QDir::separator() % QLatin1String("qtwebengine");
+    static QString pluginsPath;
 
     if (!initialized) {
         initialized = true;
-        if (!QFileInfo::exists(potentialPluginsPath))
-            potentialPluginsPath = QCoreApplication::applicationDirPath() % QDir::separator() % QLatin1String("qtwebengine");
-        if (!QFileInfo::exists(potentialPluginsPath))
-            potentialPluginsPath = fallbackDir();
-    }
+        const QStringList directories = QCoreApplication::libraryPaths();
+        Q_FOREACH (const QString &dir, directories) {
+            const QString candidate = dir % "/" % QLatin1String("qtwebengine");
+            if (QFileInfo(candidate).exists()) {
+                pluginsPath = candidate;
+                break;
+            }
+        }
 
-    return potentialPluginsPath;
+        if (pluginsPath.isEmpty()) {
+            pluginsPath = fallbackDir();
+        }
+    }
 #endif
+    return pluginsPath;
 }
 
 QString localesPath()
@@ -215,11 +232,11 @@ base::FilePath WebEngineLibraryInfo::getPath(int key)
     QString directory;
     switch (key) {
     case QT_RESOURCES_PAK:
-#if defined(OS_MACOSX) && defined(QT_MAC_FRAMEWORK_BUILD)
-        return toFilePath(getResourcesPath(frameworkBundle()) % QLatin1String("/qtwebengine_resources.pak"));
-#else
-        return toFilePath(QLibraryInfo::location(QLibraryInfo::DataPath) % QDir::separator() %  QLatin1String("qtwebengine_resources.pak"));
-#endif
+        return toFilePath(libraryDataPath() % QLatin1String("/qtwebengine_resources.pak"));
+    case QT_RESOURCES_100P_PAK:
+        return toFilePath(libraryDataPath() % QLatin1String("/qtwebengine_resources_100p.pak"));
+    case QT_RESOURCES_200P_PAK:
+        return toFilePath(libraryDataPath() % QLatin1String("/qtwebengine_resources_200p.pak"));
     case base::FILE_EXE:
     case content::CHILD_PROCESS_EXE:
         return toFilePath(subProcessPath());
diff --git a/src/core/web_engine_library_info.h b/src/core/web_engine_library_info.h
index e85258078..cd3e5be94 100644
--- a/src/core/web_engine_library_info.h
+++ b/src/core/web_engine_library_info.h
@@ -41,7 +41,9 @@
 #include "base/files/file_path.h"
 #include "base/strings/string16.h"
 enum {
-    QT_RESOURCES_PAK = 5000
+    QT_RESOURCES_PAK = 5000,
+    QT_RESOURCES_100P_PAK = 5001,
+    QT_RESOURCES_200P_PAK = 5002
 };
 
 class WebEngineLibraryInfo {
diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp
index e022d02ef..1a58ae385 100644
--- a/src/core/web_event_factory.cpp
+++ b/src/core/web_event_factory.cpp
@@ -534,8 +534,6 @@ static inline WebInputEvent::Modifiers modifiersForEvent(const QInputEvent* even
         result |= WebInputEvent::ShiftKey;
     if (modifiers & Qt::AltModifier)
         result |= WebInputEvent::AltKey;
-    if (modifiers & Qt::MetaModifier)
-        result |= WebInputEvent::MetaKey;
     if (modifiers & Qt::KeypadModifier)
         result |= WebInputEvent::IsKeyPad;
 
diff --git a/src/process/process.pro b/src/process/process.pro
index 1a62a4f2c..7844b1004 100644
--- a/src/process/process.pro
+++ b/src/process/process.pro
@@ -34,6 +34,8 @@ contains(QT_CONFIG, qt_framework) {
     QT_PRIVATE += webenginecore
 }
 
+msvc: QMAKE_LFLAGS *= /LARGEADDRESSAWARE
+
 INCLUDEPATH += ../core
 
 SOURCES = main.cpp
diff --git a/src/webengine/api/qquickwebenginecertificateerror_p.h b/src/webengine/api/qquickwebenginecertificateerror_p.h
index 18a1f90e5..6f54528d4 100644
--- a/src/webengine/api/qquickwebenginecertificateerror_p.h
+++ b/src/webengine/api/qquickwebenginecertificateerror_p.h
@@ -37,6 +37,17 @@
 #ifndef QQUICKWEBENGINECERTIFICATEERROR_P_H
 #define QQUICKWEBENGINECERTIFICATEERROR_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QObject>
 #include "qquickwebengineview_p.h"
 
diff --git a/src/webengine/api/qquickwebenginedownloaditem_p.h b/src/webengine/api/qquickwebenginedownloaditem_p.h
index 63048557f..f43eda17c 100644
--- a/src/webengine/api/qquickwebenginedownloaditem_p.h
+++ b/src/webengine/api/qquickwebenginedownloaditem_p.h
@@ -37,6 +37,17 @@
 #ifndef QQUICKWEBENGINEDOWNLOADITEM_P_H
 #define QQUICKWEBENGINEDOWNLOADITEM_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <private/qtwebengineglobal_p.h>
 #include <QObject>
 #include <QScopedPointer>
diff --git a/src/webengine/api/qquickwebenginedownloaditem_p_p.h b/src/webengine/api/qquickwebenginedownloaditem_p_p.h
index fe45ca2a3..c858693e0 100644
--- a/src/webengine/api/qquickwebenginedownloaditem_p_p.h
+++ b/src/webengine/api/qquickwebenginedownloaditem_p_p.h
@@ -37,6 +37,17 @@
 #ifndef QQUICKWEBENGINEDOWNLOADITEM_P_P_H
 #define QQUICKWEBENGINEDOWNLOADITEM_P_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "browser_context_adapter_client.h"
 #include "qquickwebenginedownloaditem_p.h"
 #include <private/qtwebengineglobal_p.h>
diff --git a/src/webengine/api/qquickwebenginehistory_p.h b/src/webengine/api/qquickwebenginehistory_p.h
index 9b3eeb617..fdde01737 100644
--- a/src/webengine/api/qquickwebenginehistory_p.h
+++ b/src/webengine/api/qquickwebenginehistory_p.h
@@ -37,6 +37,17 @@
 #ifndef QQUICKWEBENGINEHISTORY_P_H
 #define QQUICKWEBENGINEHISTORY_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <qtwebengineglobal.h>
 #include <QAbstractListModel>
 #include <QtCore/qshareddata.h>
diff --git a/src/webengine/api/qquickwebenginehistory_p_p.h b/src/webengine/api/qquickwebenginehistory_p_p.h
index 0d714b1b6..2280d05fc 100644
--- a/src/webengine/api/qquickwebenginehistory_p_p.h
+++ b/src/webengine/api/qquickwebenginehistory_p_p.h
@@ -37,6 +37,17 @@
 #ifndef QQUICKWEBENGINEHISTORY_P_P_H
 #define QQUICKWEBENGINEHISTORY_P_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 namespace QtWebEngineCore {
 class WebContentsAdapter;
 }
diff --git a/src/webengine/api/qquickwebengineloadrequest_p.h b/src/webengine/api/qquickwebengineloadrequest_p.h
index 5aae6b81f..744d03625 100644
--- a/src/webengine/api/qquickwebengineloadrequest_p.h
+++ b/src/webengine/api/qquickwebengineloadrequest_p.h
@@ -37,6 +37,17 @@
 #ifndef QQUICKWEBENGINELOADREQUEST_P_H
 #define QQUICKWEBENGINELOADREQUEST_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qtwebengineglobal_p.h"
 #include "qquickwebengineview_p.h"
 
diff --git a/src/webengine/api/qquickwebenginenavigationrequest_p.h b/src/webengine/api/qquickwebenginenavigationrequest_p.h
index ab39ed13a..9b6da4969 100644
--- a/src/webengine/api/qquickwebenginenavigationrequest_p.h
+++ b/src/webengine/api/qquickwebenginenavigationrequest_p.h
@@ -37,6 +37,17 @@
 #ifndef QQUICKWEBENGINENAVIGATIONREQUEST_P_H
 #define QQUICKWEBENGINENAVIGATIONREQUEST_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qtwebengineglobal_p.h"
 #include "qquickwebengineview_p.h"
 
diff --git a/src/webengine/api/qquickwebenginenewviewrequest_p.h b/src/webengine/api/qquickwebenginenewviewrequest_p.h
index 9c82f46d6..b408812ba 100644
--- a/src/webengine/api/qquickwebenginenewviewrequest_p.h
+++ b/src/webengine/api/qquickwebenginenewviewrequest_p.h
@@ -37,6 +37,17 @@
 #ifndef QQUICKWEBENGINENEWVIEWREQUEST_P_H
 #define QQUICKWEBENGINENEWVIEWREQUEST_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qtwebengineglobal_p.h"
 #include "qquickwebengineview_p.h"
 
diff --git a/src/webengine/api/qquickwebengineprofile_p.h b/src/webengine/api/qquickwebengineprofile_p.h
index 174734fa1..1824b3e96 100644
--- a/src/webengine/api/qquickwebengineprofile_p.h
+++ b/src/webengine/api/qquickwebengineprofile_p.h
@@ -37,6 +37,17 @@
 #ifndef QQUICKWEBENGINEPROFILE_P_H
 #define QQUICKWEBENGINEPROFILE_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <private/qtwebengineglobal_p.h>
 
 #include <QObject>
diff --git a/src/webengine/api/qquickwebengineprofile_p_p.h b/src/webengine/api/qquickwebengineprofile_p_p.h
index a702a8a1d..4df5f1934 100644
--- a/src/webengine/api/qquickwebengineprofile_p_p.h
+++ b/src/webengine/api/qquickwebengineprofile_p_p.h
@@ -37,6 +37,17 @@
 #ifndef QQUICKWEBENGINEPROFILE_P_P_H
 #define QQUICKWEBENGINEPROFILE_P_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "browser_context_adapter_client.h"
 #include "qquickwebengineprofile_p.h"
 
diff --git a/src/webengine/api/qquickwebenginescript_p.h b/src/webengine/api/qquickwebenginescript_p.h
index f1d7a01dc..de91134ef 100644
--- a/src/webengine/api/qquickwebenginescript_p.h
+++ b/src/webengine/api/qquickwebenginescript_p.h
@@ -37,6 +37,17 @@
 #ifndef QQUICKWEBENGINESCRIPT_P_H
 #define QQUICKWEBENGINESCRIPT_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <private/qtwebengineglobal_p.h>
 #include <QtCore/QObject>
 #include <QtCore/QUrl>
diff --git a/src/webengine/api/qquickwebenginescript_p_p.h b/src/webengine/api/qquickwebenginescript_p_p.h
index f8a957579..133e2dc0b 100644
--- a/src/webengine/api/qquickwebenginescript_p_p.h
+++ b/src/webengine/api/qquickwebenginescript_p_p.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the QtWebEngine module of the Qt Toolkit.
 **
@@ -37,6 +37,17 @@
 #ifndef QQUICKWEBENGINESCRIPT_P_P_H
 #define QQUICKWEBENGINESCRIPT_P_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qquickwebenginescript_p.h"
 
 #include <QtCore/QBasicTimer>
diff --git a/src/webengine/api/qquickwebenginesettings_p.h b/src/webengine/api/qquickwebenginesettings_p.h
index dce060c9f..e3f28ac92 100644
--- a/src/webengine/api/qquickwebenginesettings_p.h
+++ b/src/webengine/api/qquickwebenginesettings_p.h
@@ -37,6 +37,17 @@
 #ifndef QQUICKWEBENGINESETTINGS_P_H
 #define QQUICKWEBENGINESETTINGS_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <private/qtwebengineglobal_p.h>
 #include <QObject>
 #include <QScopedPointer>
diff --git a/src/webengine/api/qquickwebenginesingleton_p.h b/src/webengine/api/qquickwebenginesingleton_p.h
index a653116e4..744e4a9bf 100644
--- a/src/webengine/api/qquickwebenginesingleton_p.h
+++ b/src/webengine/api/qquickwebenginesingleton_p.h
@@ -37,6 +37,17 @@
 #ifndef QQUICKWEBENGINESINGLETON_P_H
 #define QQUICKWEBENGINESINGLETON_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QObject>
 #include <qtwebengineglobal_p.h>
 
diff --git a/src/webengine/api/qquickwebenginetestsupport.cpp b/src/webengine/api/qquickwebenginetestsupport.cpp
index d85e56e59..c081257e6 100644
--- a/src/webengine/api/qquickwebenginetestsupport.cpp
+++ b/src/webengine/api/qquickwebenginetestsupport.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the QtWebEngine module of the Qt Toolkit.
 **
@@ -10,15 +10,15 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
 ** General Public License version 3 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file.  Please review the following information to
+** packaging of this file. Please review the following information to
 ** ensure the GNU Lesser General Public License version 3 requirements
 ** will be met: https://www.gnu.org/licenses/lgpl.html.
 **
@@ -26,7 +26,7 @@
 ** Alternatively, this file may be used under the terms of the GNU
 ** General Public License version 2.0 or later as published by the Free
 ** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file.  Please review the following information to
+** the packaging of this file. Please review the following information to
 ** ensure the GNU General Public License version 2.0 requirements will be
 ** met: http://www.gnu.org/licenses/gpl-2.0.html.
 **
diff --git a/src/webengine/api/qquickwebenginetestsupport_p.h b/src/webengine/api/qquickwebenginetestsupport_p.h
index dcda2d78f..9690e538d 100644
--- a/src/webengine/api/qquickwebenginetestsupport_p.h
+++ b/src/webengine/api/qquickwebenginetestsupport_p.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the QtWebEngine module of the Qt Toolkit.
 **
@@ -10,15 +10,15 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
 ** General Public License version 3 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file.  Please review the following information to
+** packaging of this file. Please review the following information to
 ** ensure the GNU Lesser General Public License version 3 requirements
 ** will be met: https://www.gnu.org/licenses/lgpl.html.
 **
@@ -26,7 +26,7 @@
 ** Alternatively, this file may be used under the terms of the GNU
 ** General Public License version 2.0 or later as published by the Free
 ** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file.  Please review the following information to
+** the packaging of this file. Please review the following information to
 ** ensure the GNU General Public License version 2.0 requirements will be
 ** met: http://www.gnu.org/licenses/gpl-2.0.html.
 **
@@ -37,6 +37,17 @@
 #ifndef QQUICKWEBENGINETESTSUPPORT_P_H
 #define QQUICKWEBENGINETESTSUPPORT_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <private/qtwebengineglobal_p.h>
 
 #include <QObject>
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h
index e1c5eb25d..5b99dc3e2 100644
--- a/src/webengine/api/qquickwebengineview_p.h
+++ b/src/webengine/api/qquickwebengineview_p.h
@@ -37,6 +37,17 @@
 #ifndef QQUICKWEBENGINEVIEW_P_H
 #define QQUICKWEBENGINEVIEW_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <private/qtwebengineglobal_p.h>
 #include "qquickwebenginescript_p.h"
 #include <QQuickItem>
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
index 4d95de84e..dd03aaeb4 100644
--- a/src/webengine/api/qquickwebengineview_p_p.h
+++ b/src/webengine/api/qquickwebengineview_p_p.h
@@ -37,6 +37,17 @@
 #ifndef QQUICKWEBENGINEVIEW_P_P_H
 #define QQUICKWEBENGINEVIEW_P_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qquickwebengineview_p.h"
 #include "web_contents_adapter_client.h"
 
diff --git a/src/webengine/plugin/testsupport/plugin.cpp b/src/webengine/plugin/testsupport/plugin.cpp
index 60e56062c..98a1d3ca6 100644
--- a/src/webengine/plugin/testsupport/plugin.cpp
+++ b/src/webengine/plugin/testsupport/plugin.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the QtWebEngine module of the Qt Toolkit.
 **
@@ -10,15 +10,15 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
 ** General Public License version 3 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file.  Please review the following information to
+** packaging of this file. Please review the following information to
 ** ensure the GNU Lesser General Public License version 3 requirements
 ** will be met: https://www.gnu.org/licenses/lgpl.html.
 **
@@ -26,7 +26,7 @@
 ** Alternatively, this file may be used under the terms of the GNU
 ** General Public License version 2.0 or later as published by the Free
 ** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file.  Please review the following information to
+** the packaging of this file. Please review the following information to
 ** ensure the GNU General Public License version 2.0 requirements will be
 ** met: http://www.gnu.org/licenses/gpl-2.0.html.
 **
diff --git a/src/webengine/ui/MessageBubble.qml b/src/webengine/ui/MessageBubble.qml
index 17cf5b797..2f5d63766 100644
--- a/src/webengine/ui/MessageBubble.qml
+++ b/src/webengine/ui/MessageBubble.qml
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the QtWebEngine module of the Qt Toolkit.
 **
@@ -10,15 +10,15 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
 ** General Public License version 3 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file.  Please review the following information to
+** packaging of this file. Please review the following information to
 ** ensure the GNU Lesser General Public License version 3 requirements
 ** will be met: https://www.gnu.org/licenses/lgpl.html.
 **
@@ -26,7 +26,7 @@
 ** Alternatively, this file may be used under the terms of the GNU
 ** General Public License version 2.0 or later as published by the Free
 ** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file.  Please review the following information to
+** the packaging of this file. Please review the following information to
 ** ensure the GNU General Public License version 2.0 requirements will be
 ** met: http://www.gnu.org/licenses/gpl-2.0.html.
 **
diff --git a/src/webenginewidgets/api/qwebenginecertificateerror.cpp b/src/webenginewidgets/api/qwebenginecertificateerror.cpp
index 3535b3a9c..e320552bf 100644
--- a/src/webenginewidgets/api/qwebenginecertificateerror.cpp
+++ b/src/webenginewidgets/api/qwebenginecertificateerror.cpp
@@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \class QWebEngineCertificateError
     \brief The QWebEngineCertificateError class provides information about a certificate error.
-
+    \since 5.4
     \inmodule QtWebEngineWidgets
 
     QWebEngineCertificateError holds known information about a certificate error to be used to determine whether to allow it or not, and to be reported to the user.
diff --git a/src/webenginewidgets/api/qwebenginedownloaditem_p.h b/src/webenginewidgets/api/qwebenginedownloaditem_p.h
index 40c7c6b49..87dc4114a 100644
--- a/src/webenginewidgets/api/qwebenginedownloaditem_p.h
+++ b/src/webenginewidgets/api/qwebenginedownloaditem_p.h
@@ -37,6 +37,17 @@
 #ifndef QWEBENGINEDOWNLOADITEM_P_H
 #define QWEBENGINEDOWNLOADITEM_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qtwebenginewidgetsglobal.h"
 
 #include "qwebenginedownloaditem_p.h"
diff --git a/src/webenginewidgets/api/qwebenginehistory_p.h b/src/webenginewidgets/api/qwebenginehistory_p.h
index a3c773c5e..e45023177 100644
--- a/src/webenginewidgets/api/qwebenginehistory_p.h
+++ b/src/webenginewidgets/api/qwebenginehistory_p.h
@@ -37,6 +37,17 @@
 #ifndef QWEBENGINEHISTORY_P_H
 #define QWEBENGINEHISTORY_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtCore/qshareddata.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
index e1561c3ac..af37ae82f 100644
--- a/src/webenginewidgets/api/qwebenginepage_p.h
+++ b/src/webenginewidgets/api/qwebenginepage_p.h
@@ -37,6 +37,17 @@
 #ifndef QWEBENGINEPAGE_P_H
 #define QWEBENGINEPAGE_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qwebenginepage.h"
 
 #include "qwebenginecallback_p.h"
diff --git a/src/webenginewidgets/api/qwebengineprofile_p.h b/src/webenginewidgets/api/qwebengineprofile_p.h
index 55941580d..ee3ea57d8 100644
--- a/src/webenginewidgets/api/qwebengineprofile_p.h
+++ b/src/webenginewidgets/api/qwebengineprofile_p.h
@@ -37,6 +37,17 @@
 #ifndef QWEBENGINEPROFILE_P_H
 #define QWEBENGINEPROFILE_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "browser_context_adapter_client.h"
 #include "qwebengineprofile.h"
 #include "qwebengineurlschemehandler_p.h"
diff --git a/src/webenginewidgets/api/qwebenginescript.cpp b/src/webenginewidgets/api/qwebenginescript.cpp
index e834c5067..e47766f4c 100644
--- a/src/webenginewidgets/api/qwebenginescript.cpp
+++ b/src/webenginewidgets/api/qwebenginescript.cpp
@@ -46,9 +46,8 @@ using QtWebEngineCore::UserScript;
     \inmodule QtWebEngineWidgets
     \since 5.5
     \brief The QWebEngineScript class encapsulates a JavaScript program.
-    \preliminary
 
-    QWebEngineScript allows the programatic injection of so called "user scripts" in the
+    QWebEngineScript allows the programmatic injection of so called "user scripts" in the
     javascript engine at different points, determined by injectionPoint(), during the loading of web contents.
 
     Scripts can be executed either in the main javascript world, along with the rest of the JavaScript coming
diff --git a/src/webenginewidgets/api/qwebenginescriptcollection_p.h b/src/webenginewidgets/api/qwebenginescriptcollection_p.h
index 76267c70c..cc6e88445 100644
--- a/src/webenginewidgets/api/qwebenginescriptcollection_p.h
+++ b/src/webenginewidgets/api/qwebenginescriptcollection_p.h
@@ -37,6 +37,17 @@
 #ifndef QWEBENGINESCRIPTCOLLECTION_P_H
 #define QWEBENGINESCRIPTCOLLECTION_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qtwebenginewidgetsglobal.h"
 
 #include "qwebenginescript.h"
diff --git a/src/webenginewidgets/api/qwebengineurlrequestjob.cpp b/src/webenginewidgets/api/qwebengineurlrequestjob.cpp
index 4a813236c..2bff57236 100644
--- a/src/webenginewidgets/api/qwebengineurlrequestjob.cpp
+++ b/src/webenginewidgets/api/qwebengineurlrequestjob.cpp
@@ -10,15 +10,15 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
 ** General Public License version 3 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file.  Please review the following information to
+** packaging of this file. Please review the following information to
 ** ensure the GNU Lesser General Public License version 3 requirements
 ** will be met: https://www.gnu.org/licenses/lgpl.html.
 **
@@ -26,7 +26,7 @@
 ** Alternatively, this file may be used under the terms of the GNU
 ** General Public License version 2.0 or later as published by the Free
 ** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file.  Please review the following information to
+** the packaging of this file. Please review the following information to
 ** ensure the GNU General Public License version 2.0 requirements will be
 ** met: http://www.gnu.org/licenses/gpl-2.0.html.
 **
diff --git a/src/webenginewidgets/api/qwebengineurlrequestjob_p.h b/src/webenginewidgets/api/qwebengineurlrequestjob_p.h
index e496e4051..32e2498fa 100644
--- a/src/webenginewidgets/api/qwebengineurlrequestjob_p.h
+++ b/src/webenginewidgets/api/qwebengineurlrequestjob_p.h
@@ -10,15 +10,15 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
 ** General Public License version 3 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file.  Please review the following information to
+** packaging of this file. Please review the following information to
 ** ensure the GNU Lesser General Public License version 3 requirements
 ** will be met: https://www.gnu.org/licenses/lgpl.html.
 **
@@ -26,7 +26,7 @@
 ** Alternatively, this file may be used under the terms of the GNU
 ** General Public License version 2.0 or later as published by the Free
 ** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file.  Please review the following information to
+** the packaging of this file. Please review the following information to
 ** ensure the GNU General Public License version 2.0 requirements will be
 ** met: http://www.gnu.org/licenses/gpl-2.0.html.
 **
@@ -37,6 +37,17 @@
 #ifndef QWEBENGINEURLREQUESTJOB_H
 #define QWEBENGINEURLREQUESTJOB_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qtwebenginewidgetsglobal.h"
 
 #include <QtCore/QByteArray>
diff --git a/src/webenginewidgets/api/qwebengineurlschemehandler.cpp b/src/webenginewidgets/api/qwebengineurlschemehandler.cpp
index 65dd8f000..a0e751c24 100644
--- a/src/webenginewidgets/api/qwebengineurlschemehandler.cpp
+++ b/src/webenginewidgets/api/qwebengineurlschemehandler.cpp
@@ -10,15 +10,15 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
 ** General Public License version 3 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file.  Please review the following information to
+** packaging of this file. Please review the following information to
 ** ensure the GNU Lesser General Public License version 3 requirements
 ** will be met: https://www.gnu.org/licenses/lgpl.html.
 **
@@ -26,7 +26,7 @@
 ** Alternatively, this file may be used under the terms of the GNU
 ** General Public License version 2.0 or later as published by the Free
 ** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file.  Please review the following information to
+** the packaging of this file. Please review the following information to
 ** ensure the GNU General Public License version 2.0 requirements will be
 ** met: http://www.gnu.org/licenses/gpl-2.0.html.
 **
diff --git a/src/webenginewidgets/api/qwebengineurlschemehandler_p.h b/src/webenginewidgets/api/qwebengineurlschemehandler_p.h
index 153b78f81..7de87dff2 100644
--- a/src/webenginewidgets/api/qwebengineurlschemehandler_p.h
+++ b/src/webenginewidgets/api/qwebengineurlschemehandler_p.h
@@ -10,15 +10,15 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
 ** General Public License version 3 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file.  Please review the following information to
+** packaging of this file. Please review the following information to
 ** ensure the GNU Lesser General Public License version 3 requirements
 ** will be met: https://www.gnu.org/licenses/lgpl.html.
 **
@@ -26,7 +26,7 @@
 ** Alternatively, this file may be used under the terms of the GNU
 ** General Public License version 2.0 or later as published by the Free
 ** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file.  Please review the following information to
+** the packaging of this file. Please review the following information to
 ** ensure the GNU General Public License version 2.0 requirements will be
 ** met: http://www.gnu.org/licenses/gpl-2.0.html.
 **
@@ -37,6 +37,17 @@
 #ifndef QWEBENGINEURLSCHEMEHANDLER_H
 #define QWEBENGINEURLSCHEMEHANDLER_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qtwebenginewidgetsglobal.h"
 
 #include <QtCore/QByteArray>
diff --git a/src/webenginewidgets/api/qwebengineurlschemehandler_p_p.h b/src/webenginewidgets/api/qwebengineurlschemehandler_p_p.h
index b15171edc..d349d7d8c 100644
--- a/src/webenginewidgets/api/qwebengineurlschemehandler_p_p.h
+++ b/src/webenginewidgets/api/qwebengineurlschemehandler_p_p.h
@@ -10,15 +10,15 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
 ** General Public License version 3 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file.  Please review the following information to
+** packaging of this file. Please review the following information to
 ** ensure the GNU Lesser General Public License version 3 requirements
 ** will be met: https://www.gnu.org/licenses/lgpl.html.
 **
@@ -26,7 +26,7 @@
 ** Alternatively, this file may be used under the terms of the GNU
 ** General Public License version 2.0 or later as published by the Free
 ** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file.  Please review the following information to
+** the packaging of this file. Please review the following information to
 ** ensure the GNU General Public License version 2.0 requirements will be
 ** met: http://www.gnu.org/licenses/gpl-2.0.html.
 **
@@ -37,6 +37,17 @@
 #ifndef QWEBENGINEURLSCHEMEHANDLER_P_H
 #define QWEBENGINEURLSCHEMEHANDLER_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qwebengineurlschemehandler_p.h"
 
 #include "custom_url_scheme_handler.h"
diff --git a/src/webenginewidgets/api/qwebengineview_p.h b/src/webenginewidgets/api/qwebengineview_p.h
index b69a27ac2..af8bc70ac 100644
--- a/src/webenginewidgets/api/qwebengineview_p.h
+++ b/src/webenginewidgets/api/qwebengineview_p.h
@@ -37,6 +37,17 @@
 #ifndef QWEBENGINEVIEW_P_H
 #define QWEBENGINEVIEW_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtWebEngineWidgets/qwebengineview.h>
 
 #include <QtWidgets/qaccessiblewidget.h>
diff --git a/src/webenginewidgets/doc/src/qtwebenginewidgets.qdoc b/src/webenginewidgets/doc/src/qtwebenginewidgets.qdoc
index ed1f1a773..1e8cda065 100644
--- a/src/webenginewidgets/doc/src/qtwebenginewidgets.qdoc
+++ b/src/webenginewidgets/doc/src/qtwebenginewidgets.qdoc
@@ -28,6 +28,7 @@
 /*!
     \module QtWebEngineWidgets
     \title Qt WebEngine Widgets C++ Classes
+    \qtvariable webenginewidgets
     \brief Provides a web browser engine as well as C++ classes to render and
     interact with web content
 
@@ -47,43 +48,22 @@
     \title Qt WebEngine Widgets
     \ingroup modules
 
-    \brief The Qt WebEngine Widgets module provides a web browser engine as well as
-    C++ classes to render and interact with web content.
+    \brief The Qt WebEngine Widgets module provides a web browser engine as
+    well as C++ classes to display and interact with web content.
 
-    Qt WebEngine Widgets provides a Web browser engine that makes it easy to embed
-    content from the World Wide Web into your Qt application.
+    Qt WebEngine Widgets gives you a Web browser engine that you can use to
+    embed content easily from the World Wide Web into your Qt application.
 
-    Qt WebEngine Widgets provides facilities for rendering of HyperText Markup
-    Language version 5 (HTML5), Extensible HyperText Markup Language (XHTML) and Scalable
-    Vector Graphics (SVG) documents, styled using Cascading Style Sheets (CSS)
-    and scripted with JavaScript.
+    Qt WebEngine Widgets lets you display HyperText Markup Language version 5
+    (HTML5), Extensible HyperText Markup Language (XHTML) and Scalable Vector
+    Graphics (SVG) documents, styled using Cascading Style Sheets (CSS) and
+    scripted with JavaScript.
 
-    In addition to providing pure rendering features, HTML documents can be
-    made fully editable to the user through the use of the \c{contenteditable}
-    attribute on HTML elements.
+    HTML and XHTML documents can also be made fully editable to the user by
+    using the \c{contenteditable} attribute on HTML elements.
 
-    Qt WebEngine is based on the Chromium project. More information about
-    Chromium itself can be found on the \l{http://www.chromium.org}
-    {Chromium Project} Web site.
-
-    \section1 Should I use Qt WebEngine or Qt WebKit?
-
-    Qt WebEngine supercedes the \l{Qt WebKit Widgets}{Qt WebKit} module, which
-    was based on the WebKit project, but isn't actively synchronized with the
-    upstream WebKit code since Qt 5.2.
-
-    Chromium provides its own network and painting engines and is developed
-    tightly together with its dependent modules, thus Qt WebEngine provides
-    better and more reliable support for the latest HTML5 specification.
-    For this reason Qt WebEngine is however heavier than Qt WebKit and doesn't
-    give direct access to the network stack and the HTML document through C++ APIs.
-
-    For new code we suggest using Qt WebEngine, but it makes sense to continue
-    using Qt WebKit for applications that are in need of a deeper C++ API than
-    having better and up-to-date support for HTML, CSS and JavaScript features.
-
-    For tips on how to change a Qt WebKit application to use Qt WebEngine, see
-    \l{Porting from Qt WebKit to Qt WebEngine}
+    Qt WebEngine is based on the Chromium project. See the
+    \l{http://www.chromium.org}{Chromium Project} Web site for more information.
 
     \section1 Including In Your Project
 
diff --git a/src/webenginewidgets/doc/src/qwebenginehistory_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginehistory_lgpl.qdoc
index 08690e504..2674890de 100644
--- a/src/webenginewidgets/doc/src/qwebenginehistory_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebenginehistory_lgpl.qdoc
@@ -25,7 +25,7 @@
 /*!
     \class QWebEngineHistoryItem
     \brief The QWebEngineHistoryItem class represents one item in the history of a QWebEnginePage
-
+    \since 5.4
     \inmodule QtWebEngineWidgets
 
     Each QWebEngineHistoryItem instance represents an entry in the history stack of a Web page,
@@ -100,7 +100,7 @@
 /*!
     \class QWebEngineHistory
     \brief The QWebEngineHistory class represents the history of a QWebEnginePage
-
+    \since 5.4
     \inmodule QtWebEngineWidgets
 
     Each QWebEnginePage instance contains a history of visited pages that can be accessed
diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
index 29e5d60ce..676643387 100644
--- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
@@ -27,7 +27,7 @@
 /*!
     \class QWebEnginePage
     \brief The QWebEnginePage class provides an object to view and edit web documents.
-
+    \since 5.4
     \inmodule QtWebEngineWidgets
 
     QWebEnginePage holds a main frame responsible for web content, the history
@@ -50,8 +50,8 @@
 
     The title of an HTML page can be accessed with the title() property.
     Additionally, a page may also specify an icon, which can be accessed
-    using the icon() property. If the title or the icon changes, the
-    corresponding titleChanged() and iconChanged() signals will be emitted.
+    using the iconUrl() property. If the title or the icon changes, the
+    corresponding titleChanged() and iconUrlChanged() signals will be emitted.
     The zoomFactor() property can be used to change the overall size
     of the content displayed in the page.
 
@@ -586,6 +586,10 @@
 
     Sets the permission for the web site identified by \a securityOrigin to use \a feature to \a policy.
 
+    \note Call this method on featurePermissionRequested() signal, as it is
+    meant to serve pending feature requests only. Setting feature permissions
+    ahead of a request has no effect.
+
     \sa featurePermissionRequested(), featurePermissionRequestCanceled()
 */
 
diff --git a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
index 82410a50f..521c08781 100644
--- a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
@@ -32,7 +32,7 @@
 
 /*!
     \class QWebEngineSettings
-    \since QtWebEngine 1.0
+    \since 5.4
     \brief The QWebEngineSettings class provides an object to store the settings used
     by QWebEnginePage
 
diff --git a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
index d1b390580..163e9a28e 100644
--- a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
@@ -28,6 +28,7 @@
     \class QWebEngineView
     \brief The QWebEngineView class provides a widget that is used to view and edit
     web documents.
+    \since 5.4
     \ingroup advanced
 
     \inmodule QtWebEngineWidgets
@@ -58,8 +59,8 @@
 
     The title of an HTML document can be accessed with the title() property.
     Additionally, a web site may also specify an icon, which can be accessed
-    using the icon() property. If the title or the icon changes, the corresponding
-    titleChanged() and iconChanged() signals will be emitted. The
+    using the iconUrl() property. If the title or the icon changes, the corresponding
+    titleChanged() and iconUrlChanged() signals will be emitted. The
     textSizeMultiplier() property can be used to change the overall size of
     the text displayed in the web view.
 
diff --git a/src/webenginewidgets/ui/messagebubblewidget.cpp b/src/webenginewidgets/ui/messagebubblewidget.cpp
index 3465f4218..490e2a8f8 100644
--- a/src/webenginewidgets/ui/messagebubblewidget.cpp
+++ b/src/webenginewidgets/ui/messagebubblewidget.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the QtWebEngine module of the Qt Toolkit.
 **
@@ -10,15 +10,15 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
 ** General Public License version 3 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file.  Please review the following information to
+** packaging of this file. Please review the following information to
 ** ensure the GNU Lesser General Public License version 3 requirements
 ** will be met: https://www.gnu.org/licenses/lgpl.html.
 **
@@ -26,7 +26,7 @@
 ** Alternatively, this file may be used under the terms of the GNU
 ** General Public License version 2.0 or later as published by the Free
 ** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file.  Please review the following information to
+** the packaging of this file. Please review the following information to
 ** ensure the GNU General Public License version 2.0 requirements will be
 ** met: http://www.gnu.org/licenses/gpl-2.0.html.
 **
diff --git a/src/webenginewidgets/ui/messagebubblewidget_p.h b/src/webenginewidgets/ui/messagebubblewidget_p.h
index 7b7a9e309..28ccf1b13 100644
--- a/src/webenginewidgets/ui/messagebubblewidget_p.h
+++ b/src/webenginewidgets/ui/messagebubblewidget_p.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the QtWebEngine module of the Qt Toolkit.
 **
@@ -10,15 +10,15 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
 ** General Public License version 3 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file.  Please review the following information to
+** packaging of this file. Please review the following information to
 ** ensure the GNU Lesser General Public License version 3 requirements
 ** will be met: https://www.gnu.org/licenses/lgpl.html.
 **
@@ -26,7 +26,7 @@
 ** Alternatively, this file may be used under the terms of the GNU
 ** General Public License version 2.0 or later as published by the Free
 ** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file.  Please review the following information to
+** the packaging of this file. Please review the following information to
 ** ensure the GNU General Public License version 2.0 requirements will be
 ** met: http://www.gnu.org/licenses/gpl-2.0.html.
 **
@@ -37,6 +37,17 @@
 #ifndef MESSAGEBUBBLEWIDGET_P_H
 #define MESSAGEBUBBLEWIDGET_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QWidget>
 #include <QPainterPath>