diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-11-12 15:47:47 -0800 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-11-13 10:33:57 +0000 |
| commit | f878553d488b12c02c3ed3d1bc3d07f8c3c5754f (patch) | |
| tree | 7bdbcc8bf56ffdc0e1606c8094d2d8ec9cd98f2a /tests/auto/blackbox/testdata-apple | |
| parent | 056ef501aee7e251cde2dbcf07563f2f1c18c9aa (diff) | |
Fix assetcatalog test with newer versions of macOS
The default deployment target handling has since changed in a way such
that we cannot assume the 'default' target is the current host version.
Therefore, make the test explicit about the required deployment target.
Change-Id: I2547c6051def619dba8b9e6f18b26942fc6707cd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests/auto/blackbox/testdata-apple')
| -rw-r--r-- | tests/auto/blackbox/testdata-apple/ib/assetcatalog/assetcatalogempty.qbs | 4 |
1 files changed, 3 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 298f60e2e..ef67796f9 100644 --- a/tests/auto/blackbox/testdata-apple/ib/assetcatalog/assetcatalogempty.qbs +++ b/tests/auto/blackbox/testdata-apple/ib/assetcatalog/assetcatalogempty.qbs @@ -12,7 +12,9 @@ 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.hostOSVersionMinor >= 10 // need macOS 10.10 to build SBs + && cpp.minimumMacosVersion !== undefined + && Utilities.versionCompare(cpp.minimumMacosVersion, "10.10") >= 0) filez.push("Storyboard.storyboard"); return filez; } |