diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-04 12:34:17 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-04 12:42:35 +0100 |
| commit | 1704567d7ad0d21dd3b588af7aad40cd244c1799 (patch) | |
| tree | 932b42988e482f01125dcbf4d470e9a56107689a /build_scripts/utils.py | |
| parent | 1d77cd18510412242384c5b37a00efd5b6ce8a26 (diff) | |
| parent | c98ef56544cd54661b61529829caf6a799a1a94f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'build_scripts/utils.py')
| -rw-r--r-- | build_scripts/utils.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build_scripts/utils.py b/build_scripts/utils.py index dc90d99b7..56ec8e350 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -492,9 +492,9 @@ def regenerate_qt_resources(src, pyside_rcc_path, pyside_rcc_options): if os.path.exists(dstname): log.info('Regenerating {} from {}'.format(dstname, os.path.basename(srcname))) - run_process([pyside_rcc_path, - pyside_rcc_options, - srcname, '-o', dstname]) + run_process([pyside_rcc_path] + + pyside_rcc_options + + [srcname, '-o', dstname]) def back_tick(cmd, ret_err=False): @@ -1141,7 +1141,7 @@ def run_instruction(instruction, error, initial_env=None): def acceptCITestConfiguration(hostOS, hostOSVer, targetArch, compiler): # Disable unsupported CI configs for now # NOTE: String must match with QT CI's storagestruct thrift - if hostOSVer in ["WinRT_10", "WebAssembly", "Ubuntu_18_04"] \ + if hostOSVer in ["WinRT_10", "WebAssembly", "Ubuntu_18_04", "Android_ANY"] \ or hostOSVer.startswith("SLES_"): print("Disabled " + hostOSVer + " from Coin configuration") return False |