diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-08-20 15:05:49 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-08-20 15:47:28 +0200 |
| commit | 2a7cba9b412e5c77d46897c3c89405b64a1729b6 (patch) | |
| tree | 54915ddc908f3fca6ff124f4df61ff337c315fc3 /build/scripts/build_resources.py | |
| parent | 0342f6c5be6fd8e14651a8ac2877c83a4a7ae097 (diff) | |
| download | qtwebengine-2a7cba9b412e5c77d46897c3c89405b64a1729b6.tar.gz | |
Adjust all the needed paths when using upstream repositories
Having a separate 3rdparty_upstream might not be the best solution
after all, but oh well.
Change-Id: Ib834c4d9d56669a3f4308eb614cec787116d6d4c
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'build/scripts/build_resources.py')
| -rwxr-xr-x | build/scripts/build_resources.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/build/scripts/build_resources.py b/build/scripts/build_resources.py index d060db1f7..1b924750f 100755 --- a/build/scripts/build_resources.py +++ b/build/scripts/build_resources.py @@ -55,6 +55,8 @@ if chrome_src: chrome_src = os.path.abspath(chrome_src) if not chrome_src or not os.path.isdir(chrome_src): chrome_src = os.path.join(qtwebengine_src, '3rdparty/chromium') + if not os.path.isdir(chrome_src): + chrome_src = os.path.join(qtwebengine_src, '3rdparty_upstream/chromium') print 'CHROMIUM_SRC_DIR not set, falling back to ' + chrome_src grit_tool = os.path.join(chrome_src, 'tools/grit/grit.py') |