diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-01-22 14:55:21 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-01-23 09:40:15 +0100 |
| commit | 34e6ac44ef6d322760fcda02136b25a097b0fe15 (patch) | |
| tree | 50f3494be415740932576437782b1716493b4f2b /build_scripts/utils.py | |
| parent | f5ee713b60b541ad9d9cac11fa65b4b1091e25ac (diff) | |
| parent | cebc32a588358851dd58dc0fc892e986dd263efb (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I61b563bce41b43dda2b03ea46a456228435bc294
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 9500b3409..ffe404860 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -1133,7 +1133,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"]: + if hostOSVer in ["WinRT_10", "WebAssembly"]: print("Disabled " + hostOSVer + " from Coin configuration") return False # With 5.11 CI will create two sets of release binaries, one with msvc 2015 and one with msvc 2017 |