diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-10-24 18:51:42 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-12 00:10:48 +0000 |
commit | 2ed1e0ba423a75f68c1547fe0c06e62e773ef64d (patch) | |
tree | 51878b13727572eec3fa89162e2a643dea84db2b /src/core/gn_run.pro | |
parent | bb5a158ff01a02dbd9838094f57e0a429c248411 (diff) |
Add 'webengine' prefix to configure features, tests, libraries, etc
This is done to make sure there are no conflicts with features in
other modules, because they all share a global namespace.
Change-Id: I95b3b7fadd8ffc2979ee3aad2234ee543d57c7d8
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/gn_run.pro')
-rw-r--r-- | src/core/gn_run.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/gn_run.pro b/src/core/gn_run.pro index a9089c569..dbf859100 100644 --- a/src/core/gn_run.pro +++ b/src/core/gn_run.pro @@ -5,7 +5,7 @@ TEMPLATE = aux qtConfig(debug_and_release): CONFIG += debug_and_release build_all -qtConfig(system-ninja) { +qtConfig(webengine-system-ninja) { QT_TOOL.ninja.binary = ninja } else { QT_TOOL.ninja.binary = $$shell_quote($$shell_path($$ninjaPath())) @@ -35,7 +35,7 @@ build_pass|!debug_and_release { gn_args += "qtwebengine_target=\"$$system_path($$OUT_PWD/$$getConfigDir()):QtWebEngineCore\"" - !qtConfig(system-gn) { + !qtConfig(webengine-system-gn) { gn_binary = $$system_quote($$system_path($$gnPath())) } |