Skip to content

Commit

Permalink
Introduce the app store compliance configure option
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-by: Oswald Buddenhagen <[email protected]>
Reviewed-by: Jake Petroules <[email protected]>
  • Loading branch information
jakepetroules committed Dec 15, 2016
1 parent 21a247a commit a3a8c24
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
5 changes: 5 additions & 0 deletions config_help.txt
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ Build options:
-device <name> ....... Cross-compile for device <name>
-device-option <key=value> ... 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 <name> .. Wrap all Qt library code in 'namespace <name> {...}'.
-qtlibinfix <infix> .. Rename all libQt5*.so to libQt5*<infix>.so.

Expand Down
12 changes: 12 additions & 0 deletions configure.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@

"accessibility": "boolean",
"android-style-assets": "boolean",
"appstore-compliant": "boolean",
"avx": "boolean",
"avx2": "boolean",
"avx512": { "type": "boolean", "name": "avx512f" },
Expand Down Expand Up @@ -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 == ''",
Expand Down Expand Up @@ -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"
}
]
}, {
Expand Down

0 comments on commit a3a8c24

Please sign in to comment.