From a8cf3b02576d987970dbc1cc2a11e0fb1fc1cf86 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Sun, 24 Jul 2016 14:45:15 +0100 Subject: 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 --- configure.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure.json') 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'" } -- cgit v1.2.3