summaryrefslogtreecommitdiffstats
path: root/configure.json
diff options
context:
space:
mode:
Diffstat (limited to 'configure.json')
-rw-r--r--configure.json14
1 files changed, 13 insertions, 1 deletions
diff --git a/configure.json b/configure.json
index 6b44867b79..1bf59eb71d 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",
"autoDetect": "!config.uikit",
@@ -516,7 +523,7 @@
},
"release_tools": {
"label": "Compile tools in release mode",
- "autoDetect": "!features.debug",
+ "autoDetect": "features.debug",
"output": [ "privateFeature", "publicQtConfig" ]
},
"simulator_and_device": {
@@ -965,6 +972,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.