diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-18 18:17:49 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-12-08 12:40:53 +0000 |
| commit | e2978d6097be2313e49c57ec14618033cbfa7414 (patch) | |
| tree | b9ccc2e78f1869ed0d94c6569649c7de1488719b /configure.json | |
| parent | f882d2f443a8950a2f784fa91b3ff10a645577f7 (diff) | |
move license check to qmake-based configure system
this also removes the need for passing pre-processed options via
configure.cfg, so get rid of that.
a somewhat unfortunate side effect is that the android-style-assets
feature had to move back to the top level, as the licensing options
depend on it.
Started-by: Lars Knoll <lars.knoll@qt.io>
Change-Id: Id4d1e0ba18b3e3104400293b8f0c7f2f65e68dea
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/configure.json b/configure.json index f774291d22..5a5536936a 100644 --- a/configure.json +++ b/configure.json @@ -56,6 +56,7 @@ "android-toolchain-version": "string", "accessibility": "boolean", + "android-style-assets": "boolean", "avx": "boolean", "avx2": "boolean", "avx512": { "type": "boolean", "name": "avx512f" }, @@ -417,6 +418,12 @@ }, "features": { + "android-style-assets": { + "label": "Android Style Assets", + "condition": "config.android", + "output": [ "privateFeature" ], + "comment": "This belongs into gui, but the license check needs it here already." + }, "shared": { "label": "Building shared libraries", "condition": "!config.uikit && !config.integrity", @@ -963,6 +970,11 @@ "earlyReport": [ { + "type": "fatal", + "condition": "!call.licenseCheck", + "message": "You are not licensed to use this software." + }, + { "type": "warning", "condition": "input.debug_and_release == 'yes' && !config.darwin && !config.win32", "message": "-debug-and-release is only supported on Darwin and Windows platforms. |