From a76a364d4fcecf7603e5c9bf888c19802559603b Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@qt.io>
Date: Fri, 31 Mar 2017 12:02:23 +0200
Subject: [PATCH] Fix calls to ninja on Windows
Make sure that the path to ninja and the directory uses the correct slashes.
Without it, the call might silently fail.
Task-number: QTBUG-59842
Change-Id: If59eb14b1fb99aae2b78c85a0052e5aefd5d5bf9
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
src/core/gn_run.pro | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/core/gn_run.pro b/src/core/gn_run.pro
index 5e4438248..12df5d526 100644
--- a/src/core/gn_run.pro
+++ b/src/core/gn_run.pro
@@ -17,7 +17,7 @@ qtConfig(debug_and_release): CONFIG += debug_and_release build_all
qtConfig(system-ninja) {
QT_TOOL.ninja.binary = ninja
} else {
- QT_TOOL.ninja.binary = $$ninjaPath()
+ QT_TOOL.ninja.binary = $$shell_quote($$shell_path($$ninjaPath()))
}
win32 {
@@ -55,7 +55,7 @@ build_pass|!debug_and_release {
rungn.commands = $$runGn($$gn_binary gen $$gn_build_root --args=$$gn_args --root=$$gn_src_root)
QMAKE_EXTRA_TARGETS += rungn
- runninja.commands = $$NINJA \$\(NINJAFLAGS\) -C $$shell_quote($$OUT_PWD/$$getConfigDir()) QtWebEngineCore
+ runninja.commands = $$NINJA \$\(NINJAFLAGS\) -C $$gn_build_root QtWebEngineCore
runninja.depends += rungn
QMAKE_EXTRA_TARGETS += runninja
--
GitLab