From e5fa635a979eed688634618627c42db9a8a9701c Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@qt.io>
Date: Wed, 9 Nov 2016 22:06:16 -0800
Subject: [PATCH] iOS: Make default build static again (take 2)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 configure.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure.json b/configure.json
index 9bdc50c05c4..26f8e517e93 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",