diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-05 11:15:06 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-05 11:15:06 +0200 |
commit | 028bd20e41fc1995c34ca4c19e5342ff3efe0c6a (patch) | |
tree | 71aa1e77a262ba2d2a72dc6ac8f5c5c3a26567f2 /src/webengine | |
parent | 4ea591e7efdb63c26372af4af9507c5f57b42fcc (diff) | |
parent | b24a6419869c14e32e87cb97e529cc25c246b5e0 (diff) |
Merge 5.9 into 5.9.0v5.9.0-beta4
Change-Id: If450c073521057241f34ed9b9a7f9965c6752a15
Diffstat (limited to 'src/webengine')
-rw-r--r-- | src/webengine/doc/qtwebengine.qdocconf | 2 | ||||
-rw-r--r-- | src/webengine/webengine.pro | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/webengine/doc/qtwebengine.qdocconf b/src/webengine/doc/qtwebengine.qdocconf index fe83b082f..bc63addbe 100644 --- a/src/webengine/doc/qtwebengine.qdocconf +++ b/src/webengine/doc/qtwebengine.qdocconf @@ -67,7 +67,7 @@ exampledirs += . \ ../../core/doc/snippets \ ../../webenginewidgets/doc/snippets -examples.fileextensions += *.aff *.dic +examples.fileextensions += *.aff *.dic *.html imagedirs += images 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)) |