diff options
Diffstat (limited to 'configure.json')
-rw-r--r-- | configure.json | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/configure.json b/configure.json index f9abdae8ca..4030d359ae 100644 --- a/configure.json +++ b/configure.json @@ -58,6 +58,7 @@ "accessibility": "boolean", "android-style-assets": "boolean", + "appstore-compliant": "boolean", "avx": "boolean", "avx2": "boolean", "avx512": { "type": "boolean", "name": "avx512f" }, @@ -435,7 +436,8 @@ }, "shared": { "label": "Building shared libraries", - "condition": "!config.uikit && !config.integrity", + "autoDetect": "!config.uikit", + "condition": "!config.integrity", "output": [ "shared", "publicFeature", @@ -454,7 +456,7 @@ "cross_compile": { "label": "Cross compiling", "condition": "call.crossCompile", - "output": [ "publicConfig", "privateConfig" ] + "output": [ "publicConfig", "privateConfig", "publicFeature" ] }, "cxx11default": { "label": "Compiler defaults to C++11 or higher", @@ -474,7 +476,7 @@ }, "use_gold_linker": { "label": "Using gold linker", - "condition": "!config.msvc && tests.use_gold_linker", + "condition": "!config.msvc && !config.integrity && tests.use_gold_linker", "output": [ "privateConfig", "useGoldLinker" ] }, "architecture": { @@ -534,6 +536,12 @@ "autoDetect": "features.debug", "output": [ "privateFeature", "publicQtConfig" ] }, + "appstore-compliant": { + "label": "App store compliance", + "purpose": "Disables code that is not allowed in platform app stores", + "autoDetect": "config.uikit || config.android || config.winrt", + "output": [ "publicFeature" ] + }, "simulator_and_device": { "label": "Build for both simulator and device", "condition": "config.uikit && input.sdk == ''", @@ -943,6 +951,7 @@ }, "widgets": { "label": "Qt Widgets", + "autoDetect": "!config.tvos && !config.watchos", "condition": "features.gui", "output": [ "privateFeature", @@ -1129,6 +1138,11 @@ Configure with '-qreal float' to create a build that is binary-compatible with 5 { "message": "Build parts", "type": "buildParts" + }, + { + "type": "feature", + "args": "appstore-compliant", + "condition": "config.darwin || config.android || config.winrt || config.win32" } ] }, { |