diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-07 17:34:27 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-14 16:43:41 +0200 |
| commit | 4be6a15559b0dfb7c53b72e2480ce8e09326b3c1 (patch) | |
| tree | 86b9aa9d6c00935d79e545578876aec68c143610 /tools/buildscripts/qtwebengine_utils.py | |
| parent | 3a30ed4ecc9c828641daef85f88f93baf78826b6 (diff) | |
Fix the build on windows when qtwebengine.chromiumsrcdir isn't set
qtwe_chromium_obj_dir wasn't falling back to src/3rdparty if the
config couldn't be found in git.
Move the fallback logic to a getChromiumSrcDir qmake function, and
use it in both places.
The build system will now also print that the Chromium sources will
follow the git config if found instead of the other way around,
since this should now be the normal case as part of Qt5.
Change-Id: I5ab972ab53156c1bd033518e2eb51013559491ac
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'tools/buildscripts/qtwebengine_utils.py')
| -rwxr-xr-x | tools/buildscripts/qtwebengine_utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/buildscripts/qtwebengine_utils.py b/tools/buildscripts/qtwebengine_utils.py index 60466da02..1b629c65c 100755 --- a/tools/buildscripts/qtwebengine_utils.py +++ b/tools/buildscripts/qtwebengine_utils.py @@ -59,8 +59,8 @@ def getChromiumSrcDir(): if chrome_src: chrome_src = os.path.join(qtwebengine_root, chrome_src) + print('Using external chromium sources specified in git config qtwebengine.chromiumsrcdir: ' + chrome_src) if not chrome_src or not os.path.isdir(chrome_src): chrome_src = os.path.normpath(os.path.join(qtwebengine_root, 'src/3rdparty/chromium')) - print 'No external chromium sources were found, falling back to ' + chrome_src return chrome_src |