summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/buildtools/gn.pro2
-rw-r--r--src/buildtools/ninja.pro2
-rw-r--r--src/core/gn_run.pro3
-rw-r--r--src/webengine/webengine.pro3
4 files changed, 6 insertions, 4 deletions
diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro
index 092888e0..f8f8b20d 100644
--- a/src/buildtools/gn.pro
+++ b/src/buildtools/gn.pro
@@ -14,7 +14,7 @@ defineReplace(buildGn) {
gn_bootstrap = $$system_path($$absolute_path(chromium/tools/gn/bootstrap/bootstrap.py, $$src_3rd_party_dir))
gn_args = $$system_quote($$gn_args)
gn_configure = $$system_quote($$gn_bootstrap) --shadow --gn-gen-args=$$gn_args $$ninja_path
- !system("cd $$system_quote($$system_path($$dirname(out))) && python $$gn_configure") {
+ !system("cd $$system_quote($$system_path($$dirname(out))) && $$pythonPathForSystem() $$gn_configure") {
error("GN build error!")
}
}
diff --git a/src/buildtools/ninja.pro b/src/buildtools/ninja.pro
index c391d6e8..0a01f1f4 100644
--- a/src/buildtools/ninja.pro
+++ b/src/buildtools/ninja.pro
@@ -8,7 +8,7 @@ defineReplace(buildNinja) {
mkpath($$dirname(out))
src_3rd_party_dir = $$absolute_path("$${getChromiumSrcDir()}/../", "$$QTWEBENGINE_ROOT")
ninja_configure = $$system_quote($$system_path($$absolute_path(ninja/configure.py, $$src_3rd_party_dir)))
- !system("cd $$system_quote($$system_path($$dirname(out))) && python $$ninja_configure --bootstrap") {
+ !system("cd $$system_quote($$system_path($$dirname(out))) && $$pythonPathForSystem() $$ninja_configure --bootstrap") {
error("NINJA build error!")
}
}
diff --git a/src/core/gn_run.pro b/src/core/gn_run.pro
index 07635d04..b6966a51 100644
--- a/src/core/gn_run.pro
+++ b/src/core/gn_run.pro
@@ -51,7 +51,8 @@ build_pass|!debug_and_release {
gn_args = $$shell_quote($$gn_args)
gn_src_root = $$shell_quote($$shell_path($$QTWEBENGINE_ROOT/$$getChromiumSrcDir()))
gn_build_root = $$shell_quote($$shell_path($$OUT_PWD/$$getConfigDir()))
- $$runGn($$gn_binary gen $$gn_build_root --args=$$gn_args --root=$$gn_src_root)
+ gn_python = "--script-executable=$$pythonPathForSystem()"
+ $$runGn($$gn_binary gen $$gn_build_root $$gn_python --args=$$gn_args --root=$$gn_src_root)
runninja.commands = $$NINJA \$\(NINJAFLAGS\) -C $$gn_build_root QtWebEngineCore
QMAKE_EXTRA_TARGETS += runninja
diff --git a/src/webengine/webengine.pro b/src/webengine/webengine.pro
index 27239225..5ac93c9a 100644
--- a/src/webengine/webengine.pro
+++ b/src/webengine/webengine.pro
@@ -71,9 +71,10 @@ use?(pdf) {
}
!build_pass {
+ python = $$pythonPathForShell()
chromium_attributions.commands = \
cd $$shell_quote($$shell_path($$PWD/../3rdparty)) && \
- python chromium/tools/licenses.py \
+ $$python chromium/tools/licenses.py \
--file-template ../../tools/about_credits.tmpl \
--entry-template ../../tools/about_credits_entry.tmpl credits \
> $$shell_quote($$shell_path($$OUT_PWD/chromium_attributions.qdoc))