diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2020-12-12 16:06:24 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-12-14 09:54:55 +0000 |
| commit | 93a93735925f3dda80ee3fc78a85b9fcc729e975 (patch) | |
| tree | db1ef86e3a0f345a2f641ff768ffc6cd96251b91 | |
| parent | 186cbe0795bcbd3632ab764f7be363c5163e264d (diff) | |
| download | qbs-93a93735925f3dda80ee3fc78a85b9fcc729e975.tar.gz | |
Fix assetCatalog test for macOS 11.*
Change-Id: I94755e03572003275483a4bac95660a007dff0bc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | tests/auto/blackbox/testdata-apple/ib/assetcatalog/assetcatalogempty.qbs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/blackbox/testdata-apple/ib/assetcatalog/assetcatalogempty.qbs b/tests/auto/blackbox/testdata-apple/ib/assetcatalog/assetcatalogempty.qbs index 94361f34d..6e999adda 100644 --- a/tests/auto/blackbox/testdata-apple/ib/assetcatalog/assetcatalogempty.qbs +++ b/tests/auto/blackbox/testdata-apple/ib/assetcatalog/assetcatalogempty.qbs @@ -17,7 +17,8 @@ Project { filez.push("empty.xcassets/empty.iconset"); else if (Utilities.versionCompare(xcode.version, "5") >= 0) filez.push("empty.xcassets"); - if (qbs.hostOSVersionMinor >= 10 // need macOS 10.10 to build SBs + if ((qbs.hostOSVersionMajor >= 11 + || qbs.hostOSVersionMinor >= 10) // need macOS 10.10 or higher to build SBs && cpp.minimumMacosVersion !== undefined && Utilities.versionCompare(cpp.minimumMacosVersion, "10.10") >= 0) filez.push("Storyboard.storyboard"); |