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>
This commit is contained in:
Mike Krus 2016-07-24 14:45:15 +01:00
parent 3f1e8d85cc
commit a8cf3b0257

View File

@ -957,7 +957,7 @@
"features": { "features": {
"shared": { "shared": {
"description": "Building shared libraries", "description": "Building shared libraries",
"condition": "!config.ios && !config.integrity", "condition": "!config.uikit && !config.integrity",
"output": [ "output": [
"shared", "shared",
"publicQtConfig", "publicQtConfig",
@ -1047,7 +1047,7 @@
}, },
"simulator_and_device": { "simulator_and_device": {
"description": "Build for both simulator and device", "description": "Build for both simulator and device",
"condition": "config.ios && input.sdk == ''", "condition": "config.uikit && input.sdk == ''",
"output": [ "publicQtConfig" ] "output": [ "publicQtConfig" ]
}, },
"build_all": { "build_all": {
@ -1198,7 +1198,7 @@
}, },
"precompile_header": { "precompile_header": {
"description": "Using precompiled headers", "description": "Using precompiled headers",
"condition": "!config.ios && tests.precompile_header", "condition": "!config.uikit && tests.precompile_header",
"output": [ "output": [
"privateConfig", "privateConfig",
{ "type": "varRemove", "negative": true, "name": "CONFIG", "value": "'precompile_header'" } { "type": "varRemove", "negative": true, "name": "CONFIG", "value": "'precompile_header'" }