diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-04-25 12:46:36 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-04-27 09:35:01 +0000 |
| commit | e453be82f510303e41a24c0093bd03c7f8374f75 (patch) | |
| tree | b38160e341c96fa4cda4b20577c812affcdb2b90 /src/webengine | |
| parent | 3b24c024f2606cd93b1f397338f349582003c2ce (diff) | |
Make python2 usage more robust
After configuring Qt there will be an error message if a suitable python
version could not be found.
Add python2 configure test that
- first looks for python2 in PATH
- then looks for python in PATH
- checks the Python version
- stores the result in QMAKE_PYTHON2
Use $$QMAKE_PYTHON2 everywhere where we call python.
Pass $$QMAKE_PYTHON2 to gn for its exec_script feature.
Task-number: QTBUG-60164
Change-Id: I33de1273cbd20a787b3c8889d35280784dbcd5ae
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/webengine')
| -rw-r--r-- | src/webengine/webengine.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/webengine/webengine.pro b/src/webengine/webengine.pro index 27239225b..5ac93c9a7 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)) |