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/Scripts/webkitpy/common/multiprocessing_bootstrap.py | |
| 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/Scripts/webkitpy/common/multiprocessing_bootstrap.py')
| -rw-r--r--[-rwxr-xr-x] | Tools/Scripts/webkitpy/common/multiprocessing_bootstrap.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tools/Scripts/webkitpy/common/multiprocessing_bootstrap.py b/Tools/Scripts/webkitpy/common/multiprocessing_bootstrap.py index 11897764e..366c41314 100755..100644 --- a/Tools/Scripts/webkitpy/common/multiprocessing_bootstrap.py +++ b/Tools/Scripts/webkitpy/common/multiprocessing_bootstrap.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright (c) 2011 Google Inc. All rights reserved. # Copyright (C) 2010 Chris Jerdonek (cjerdonek@webkit.org) # @@ -58,7 +57,8 @@ def run(*parts): # doesn't need to do it and their process id as reported by # subprocess.Popen is not jhbuild's. if '--gtk' in sys.argv[1:] and os.path.exists(os.path.join(script_dir, '..', '..', 'WebKitBuild', 'Dependencies')): - cmd.insert(1, os.path.join(script_dir, '..', 'gtk', 'run-with-jhbuild')) + prefix = [os.path.join(script_dir, '..', 'jhbuild', 'jhbuild-wrapper'), '--gtk', 'run'] + cmd = prefix + cmd proc = subprocess.Popen(cmd, env=env) try: |