diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-11-09 22:06:16 -0800 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2016-11-10 11:35:30 +0000 |
| commit | e5fa635a979eed688634618627c42db9a8a9701c (patch) | |
| tree | 6941fc3a8e875f6c8c21d8038f2fa7bfe74760c1 /configure.json | |
| parent | bd75876e7e94a718ccf744a28a81c8ddda753b28 (diff) | |
iOS: Make default build static again (take 2)
amends aa3d08ee868c281e38ad1a476f6f3becb4c9aa34, which attempted to
revert the default change to -shared in 4c26b4863361 but failed to take
into account an explicitly passed -shared argument, resulting in:
ERROR: Feature 'shared' was enabled, but the pre-condition
'!config.uikit && !config.integrity' failed.
Change-Id: Ide381624245e7c132a07e98c9107be7126dd488a
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.json b/configure.json index 9bdc50c05c..26f8e517e9 100644 --- a/configure.json +++ b/configure.json @@ -462,7 +462,8 @@ "features": { "shared": { "label": "Building shared libraries", - "condition": "!config.uikit && !config.integrity", + "autoDetect": "!config.uikit", + "condition": "!config.integrity", "output": [ "shared", "publicFeature", |