diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-02-04 13:50:57 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-02-04 14:13:39 +0100 |
| commit | 6722bbbf4ea2ddcdd9194f26a883029ec3afc39a (patch) | |
| tree | c3290b82fac21c4990be8472ae6cb4ca043205cf /tools/buildscripts/gyp_qtwebengine | |
| parent | 41d69eb0fa2375f0da6ba9b35136f5598be4b3a4 (diff) | |
| parent | 82f4d13a13b40d9cb7710f6dd4190175a272a394 (diff) | |
Merge branch '5.6' into dev
Change-Id: I0bb971f01ee1e02da768f336680c8ec0254ab2b0
Diffstat (limited to 'tools/buildscripts/gyp_qtwebengine')
| -rwxr-xr-x | tools/buildscripts/gyp_qtwebengine | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tools/buildscripts/gyp_qtwebengine b/tools/buildscripts/gyp_qtwebengine index ec24caeb1..d896364ed 100755 --- a/tools/buildscripts/gyp_qtwebengine +++ b/tools/buildscripts/gyp_qtwebengine @@ -152,11 +152,6 @@ if __name__ == '__main__': args.extend(['-D', 'qtwebengine_root=' + purifyGypVarPath(qtwebengine_root)]) args.extend(['-D', 'chromium_src_dir=' + purifyGypVarPath(chrome_src)]) - args.extend(['-D', 'clang_use_chrome_plugins=0']) - # We do not want to ship more external binary blobs, so let v8 embed its startup data. - args.extend(['-D', 'v8_use_external_startup_data=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) args.extend(['--generator-output', '.']) args.extend(['-Goutput_dir='+ os.path.relpath(output_dir, qtwebengine_root)]) |