From a3a8c24d6ecf894072b844e5428a11fd567fa027 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Sat, 3 Dec 2016 02:24:55 -0800 Subject: Introduce the app store compliance configure option QtWebEngine requires this in order to disable code that is not allowed on the Mac App Store. The option is too generic to go directly into QtWebEngine however, as it can be used to toggle additional features in qtbase as well as on platforms other than macOS. Change-Id: I556298f4b654a8904c33002ef097a75e2e38938e Reviewed-by: Allan Sandfeld Jensen Reviewed-by: Oswald Buddenhagen Reviewed-by: Jake Petroules --- config_help.txt | 5 +++++ configure.json | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/config_help.txt b/config_help.txt index fb4606c8cf..28634be947 100644 --- a/config_help.txt +++ b/config_help.txt @@ -90,6 +90,11 @@ Build options: -device ....... Cross-compile for device -device-option ... Add option for the device mkspec + -appstore-compliant .. Disable code that is not allowed in platform app stores. + This is on by default for platforms which require distribution + through an app store by default, in particular Android, + iOS, tvOS, watchOS, and Universal Windows Platform. [auto] + -qtnamespace .. Wrap all Qt library code in 'namespace {...}'. -qtlibinfix .. Rename all libQt5*.so to libQt5*.so. diff --git a/configure.json b/configure.json index 1bf59eb71d..c13f44ed00 100644 --- a/configure.json +++ b/configure.json @@ -57,6 +57,7 @@ "accessibility": "boolean", "android-style-assets": "boolean", + "appstore-compliant": "boolean", "avx": "boolean", "avx2": "boolean", "avx512": { "type": "boolean", "name": "avx512f" }, @@ -526,6 +527,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 == ''", @@ -1102,6 +1109,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" } ] }, { -- cgit v1.2.3