diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-11-20 13:49:26 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-11-20 13:49:26 +0100 |
| commit | 0bcff4da6a22acdc522e7c27607ad4d2a2ffe843 (patch) | |
| tree | bb66a5ccc65c3094235230b301cc5bfb7e47af8d /src/core/gn_run.pro | |
| parent | f841341a22d5b460c81f8e7ee7fa9434500404c8 (diff) | |
| parent | f1003c50652c1f5ef9ae0e16036b175fe3e8f215 (diff) | |
Merge 5.10 into 5.10.0
Change-Id: I05f7952ea887536674045ed0779967e23388c5d1
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())) } |