diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-04-24 14:24:06 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-04-24 14:24:09 +0200 |
| commit | 8b892f71b749a623724ccecca881972a33c9d559 (patch) | |
| tree | 88d7a2371481cafd559d4895efa41b6f166ed8ac /build_scripts/utils.py | |
| parent | fff6ea0059b7394869166a01674a9afa230bc3a9 (diff) | |
| parent | a7038d87ba6ec3b2beeee166930c24f290f6478f (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I28805a29caa05e996b490ba46e27ddbc243cc074
Diffstat (limited to 'build_scripts/utils.py')
| -rw-r--r-- | build_scripts/utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build_scripts/utils.py b/build_scripts/utils.py index 6aafb7588..460c1b21f 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -392,7 +392,7 @@ def run_process_output(args, initial_env=None): std_out = subprocess.Popen(args, env = initial_env, universal_newlines = 1, - stdout=subprocess.PIPE).stdout + stdout=subprocess.PIPE).stdout result = [] for raw_line in std_out.readlines(): line = raw_line if sys.version_info >= (3,) else raw_line.decode('utf-8') |
