diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Tools/jhbuild | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Tools/jhbuild')
| -rwxr-xr-x | Tools/jhbuild/jhbuild-wrapper | 2 | ||||
| -rw-r--r-- | Tools/jhbuild/jhbuildutils.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Tools/jhbuild/jhbuild-wrapper b/Tools/jhbuild/jhbuild-wrapper index 40bbb0101..9d3a87b44 100755 --- a/Tools/jhbuild/jhbuild-wrapper +++ b/Tools/jhbuild/jhbuild-wrapper @@ -23,7 +23,7 @@ import shlex import subprocess import sys -jhbuild_revision = '1eedc423f75c605224b430579e4c303292199507' +jhbuild_revision = '496974221c3a8ac4fbbc3b0a577c71cac224130d' dependencies_path = jhbuildutils.get_dependencies_path() installation_prefix = os.path.abspath(os.path.join(dependencies_path, 'Root')) diff --git a/Tools/jhbuild/jhbuildutils.py b/Tools/jhbuild/jhbuildutils.py index c9972b85a..f68124d4d 100644 --- a/Tools/jhbuild/jhbuildutils.py +++ b/Tools/jhbuild/jhbuildutils.py @@ -14,8 +14,8 @@ def top_level_path(*args): def get_dependencies_path(): - if 'WEBKITOUTPUTDIR' in os.environ: - return os.path.abspath(os.path.join(os.environ['WEBKITOUTPUTDIR'], 'Dependencies')) + if 'WEBKIT_OUTPUTDIR' in os.environ: + return os.path.abspath(os.path.join(os.environ['WEBKIT_OUTPUTDIR'], 'Dependencies')) else: return os.path.abspath(top_level_path('WebKitBuild', 'Dependencies')) |