Update the QtWebEngineCore library to run on top of Chromium 37

Most of the patch is about upstream classes/methods that changed.

Other important details:
- icu data files are now used by default
- cygwin is no longer required to build on Windows
- RenderFrameHost has been replacing RenderViewHost in a few places,
  following the separate process iframes support in Chromium
- The user agent is accessed through ContentClient::GetUserAgent
  instead of from the command line switches

Change-Id: I86cc93aff7ce31176a80b0b4a5d54025674a451c
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

1 files changed, 4 insertions, 12 deletions

diff --git a/tools/buildscripts/gyp_qtwebengine b/tools/buildscripts/gyp_qtwebengine
index 29d33a802..1bda49855 100755
--- a/tools/buildscripts/gyp_qtwebengine
+++ b/tools/buildscripts/gyp_qtwebengine
@@ -77,16 +77,6 @@ if __name__ == '__main__':
   if 'qt_cross_compile=1' in sys.argv:
     os.environ['GYP_CROSSCOMPILE'] = '1'
 
-  # On Windows we have to update the path of Chromium's Cygwin in registry to ensure current build
-  # uses Cygwin from the current source directory.
-  if sys.platform.startswith('win32'):
-    print 'Updating Cygwin\'s path in registry...'
-    setup_mount = os.path.abspath(os.path.join(chrome_src,'third_party','cygwin','setup_mount.bat'))
-    ret = subprocess.call(setup_mount)
-    if ret != 0:
-      print 'Failed to run', setup_mount
-      sys.exit(1)
-
   # On Mac we want to override CXX and CC that is provided with
   # the Chromium GYP environment.
   if sys.platform.startswith('darwin') and not 'GYP_CROSSCOMPILE' in os.environ:
@@ -141,10 +131,12 @@ if __name__ == '__main__':
   args.extend(['-D', 'qtwebengine_root=' + qtwebengine_root])
   args.extend(['-D', 'chromium_src_dir=' + chrome_src])
 
-  # linux_use_gold_binary currently relies on a hardcoded relative path from chromium/src/out/(Release|Debug)
+  # linux_use_bundled_gold currently relies on a hardcoded relative path from chromium/src/out/(Release|Debug)
   # Disable it along with the -Wl,--threads flag just in case gold isn't installed on the system.
-  args.extend(['-D', 'linux_use_gold_binary=0'])
+  args.extend(['-D', 'linux_use_bundled_gold=0'])
+  args.extend(['-D', 'linux_use_bundled_binutils=0'])
   args.extend(['-D', 'linux_use_gold_flags=0'])
+  args.extend(['-D', 'clang_use_chrome_plugins=0'])
   # Trigger Qt-specific build conditions.
   args.extend(['-D', 'use_qt=1'])
   # Tweak the output location and format (hardcode ninja for now if not set)