diff options
| author | Mike Krus <mike.krus@kdab.com> | 2016-07-24 14:45:15 +0100 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2016-07-25 06:57:31 +0000 |
| commit | a8cf3b02576d987970dbc1cc2a11e0fb1fc1cf86 (patch) | |
| tree | 78fe93e350364351deaa7c233833b11ca8c15d15 /configure.json | |
| parent | 3f1e8d85cce8e8385476f189fb0a129bde7b8d7d (diff) | |
Extend tests in new json config file to cover UIKIT platforms
Replace ios tests with uikit to include tvos
Change-Id: Ifc67d556a2b3b24532d0f87b12599420f895ddbd
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.json b/configure.json index 51843cbbb3..260dece2d6 100644 --- a/configure.json +++ b/configure.json @@ -957,7 +957,7 @@ "features": { "shared": { "description": "Building shared libraries", - "condition": "!config.ios && !config.integrity", + "condition": "!config.uikit && !config.integrity", "output": [ "shared", "publicQtConfig", @@ -1047,7 +1047,7 @@ }, "simulator_and_device": { "description": "Build for both simulator and device", - "condition": "config.ios && input.sdk == ''", + "condition": "config.uikit && input.sdk == ''", "output": [ "publicQtConfig" ] }, "build_all": { @@ -1198,7 +1198,7 @@ }, "precompile_header": { "description": "Using precompiled headers", - "condition": "!config.ios && tests.precompile_header", + "condition": "!config.uikit && tests.precompile_header", "output": [ "privateConfig", { "type": "varRemove", "negative": true, "name": "CONFIG", "value": "'precompile_header'" } |