diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2016-11-09 12:05:56 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2016-11-09 13:39:18 +0000 |
| commit | aa3d08ee868c281e38ad1a476f6f3becb4c9aa34 (patch) | |
| tree | 803ea9b870cf3105c48e68c9d94021eb5c6aba64 /configure.json | |
| parent | 94b0e4c5d62670adbeafab2d326d0b9d6a4450a2 (diff) | |
iOS: Make default build static again
This is a revert of the default change to -shared in 4c26b4863361,
which was landed without dependent changes like
https://codereview.qt-project.org/#/c/160747/ being landed first,
breaking the build for people building with the default configure
arguments.
Change-Id: I66eba76ca681ccf9b2ee54fa16b3e08888ae2fb4
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.json b/configure.json index 9b541a18ff..9bdc50c05c 100644 --- a/configure.json +++ b/configure.json @@ -462,7 +462,7 @@ "features": { "shared": { "label": "Building shared libraries", - "condition": "!config.integrity", + "condition": "!config.uikit && !config.integrity", "output": [ "shared", "publicFeature", |