diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-04-05 18:21:49 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-04-08 09:13:35 +0000 |
commit | afd4ee23124541c23fe58639f138ed7689cac562 (patch) | |
tree | 30bacee9bbf46d08bca8b5ffcc28f6dd8620a766 | |
parent | d8f121f7ea831f1d5ec27e17cc268945f3cb2a30 (diff) |
Use correct environment variable to detect when running in Coin
The code for shipping MSVC redist dlls used to check for the
"QTEST_ENVIRONMENT" environment variable to decide when to
download and extract the libraries. This was incorrect, because
it is only set in a Coin test phase, and not when building
the project.
Revert to using the old "COIN_LAUNCH_PARAMETERS" environment variable
which is set during the Coin build phase.
Amends 9e13465a992a5079c0a038e5f9417896dcfd6f3a .
Fixes: PYSIDE-993
Change-Id: I96d1e010ffc4b3a5951bdd28699f657e3a5f4a3f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r-- | build_scripts/platforms/windows_desktop.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py index dac7a6f1b..ae0d66682 100644 --- a/build_scripts/platforms/windows_desktop.py +++ b/build_scripts/platforms/windows_desktop.py @@ -276,8 +276,8 @@ def copy_msvc_redist_files(vars, redist_target_path): os.makedirs(redist_target_path) # Extract Qt dependency dlls when building on Qt CI. - in_coin = os.environ.get("QTEST_ENVIRONMENT", None) == "ci" - if in_coin: + in_coin = os.environ.get('COIN_LAUNCH_PARAMETERS', None) + if in_coin is not None: redist_url = "http://download.qt.io/development_releases/prebuilt/vcredist/" zip_file = "pyside_qt_deps_64.7z" if "{target_arch}".format(**vars) == "32": |