diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-21 08:43:01 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-21 08:43:01 +0200 |
| commit | 98eb59226aca550ae086c00b9c8023f47c44d2b2 (patch) | |
| tree | 7e8a136347b5eb52ca0592b33aea09af97bf978a /build_scripts | |
| parent | 968e9adeccddfc7e3bc376e7b7606b376d8feecf (diff) | |
| parent | 8728594d6b2e0f3df3e3726b67cf23715dfdcbe3 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ia31df23a16575f9ecefe13ec85fb70197d103278
Diffstat (limited to 'build_scripts')
| -rw-r--r-- | build_scripts/qp5_tool.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/build_scripts/qp5_tool.py b/build_scripts/qp5_tool.py index 6fa5e1c66..1358b21c2 100644 --- a/build_scripts/qp5_tool.py +++ b/build_scripts/qp5_tool.py @@ -271,7 +271,9 @@ def read_config_python_binary(): binary = read_config(PYTHON_KEY) if binary: return binary - return 'python3' if which('python3') else 'python' + # Use 'python3' unless virtualenv is set + use_py3 = (not os.environ.get('VIRTUAL_ENV') and which('python3')) + return 'python3' if use_py3 else 'python' def get_config_file(base_name): |