diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-02-06 11:40:04 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-02-06 10:44:06 +0000 |
| commit | 263df6601717b52237f62c08ad1f6bc536093e45 (patch) | |
| tree | e67c1d95a37e21396d9c45e14b904a99d888e9b6 | |
| parent | f9bf6e0138e71dd076aa173fd9bbf2ae4bd91ae2 (diff) | |
Fix environment check regarding msvc redist libraries
Empty string is not the same as None. This caused the redist
libraries to always be downloaded.
Change-Id: Ib4951ba0e56c87749aa85cb3b815ce222ecb95cd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | build_scripts/platforms/windows_desktop.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py index 5208ed949..47c1376c3 100644 --- a/build_scripts/platforms/windows_desktop.py +++ b/build_scripts/platforms/windows_desktop.py @@ -276,8 +276,7 @@ def copy_msvc_redist_files(vars, redist_target_path): os.makedirs(redist_target_path) # Extract Qt dependency dlls when building on Qt CI. - # There is no proper CI env variable, so using agent launch params. - in_coin = os.environ.get("QTEST_ENVIRONMENT", "") == "ci" + in_coin = os.environ.get("QTEST_ENVIRONMENT", None) == "ci" if in_coin is not None: redist_url = "http://download.qt.io/development_releases/prebuilt/vcredist/" zip_file = "pyside_qt_deps_64.7z" |