diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-07-19 14:12:54 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-11 17:25:32 +0000 |
| commit | 7282fb4fb4861320539f2b7288f63e1d4f48749d (patch) | |
| tree | 3fb62ed4d45875be975410b08c776888803748ec /src/buildtools | |
| parent | 82499104972d24027044acaff1136ea7d758efe2 (diff) | |
Adaptations for Chromium 60
Change-Id: I536258e22c2ec143f2fd3f1cbda229e0611b6af4
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/buildtools')
| -rw-r--r-- | src/buildtools/gn.pro | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro index 829e7a31a..db4bbf82c 100644 --- a/src/buildtools/gn.pro +++ b/src/buildtools/gn.pro @@ -19,7 +19,14 @@ build_pass|!debug_and_release { mkpath($$dirname(out)) src_3rd_party_dir = $$absolute_path("$${getChromiumSrcDir()}/../", "$$QTWEBENGINE_ROOT") gn_bootstrap = $$system_path($$absolute_path(chromium/tools/gn/bootstrap/bootstrap.py, $$src_3rd_party_dir)) + gn_args = $$system_quote($$gn_args) + win32:isDeveloperBuild() { + # GN is always built in release mode, which conflicts with incremental linking when + # doing a developer build of WebEngine. + gn_args = $$replace(gn_args, "use_incremental_linking=true ", "") + } + gn_configure = $$system_quote($$gn_bootstrap) --shadow --gn-gen-args=$$gn_args $$ninja_path !system("cd $$system_quote($$system_path($$dirname(out))) && $$pythonPathForSystem() $$gn_configure") { error("GN build error!") |