diff options
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 73 |
1 files changed, 58 insertions, 15 deletions
diff --git a/configure.json b/configure.json index d987832fba..c5be88856d 100644 --- a/configure.json +++ b/configure.json @@ -55,8 +55,8 @@ "android-sdk": "string", "android-toolchain-version": "string", - "accessibility": "boolean", "android-style-assets": "boolean", + "appstore-compliant": "boolean", "avx": "boolean", "avx2": "boolean", "avx512": { "type": "boolean", "name": "avx512f" }, @@ -72,6 +72,7 @@ "developer-build": "void", "device": "string", "device-option": "addString", + "f16c": "boolean", "force-asserts": { "type": "boolean", "name": "force_asserts" }, "force-debug-info": { "type": "boolean", "name": "force_debug_info" }, "force-pkg-config": { "type": "void", "name": "pkg-config" }, @@ -91,6 +92,7 @@ "mp": { "type": "boolean", "name": "msvc_mp" }, "nomake": { "type": "addString", "values": [ "examples", "tests", "tools" ] }, "opensource": { "type": "void", "name": "commercial", "value": "no" }, + "optimize-debug": { "type": "boolean", "name": "optimize_debug" }, "optimized-qmake": { "type": "boolean", "name": "release_tools" }, "optimized-tools": { "type": "boolean", "name": "release_tools" }, "pch": { "type": "boolean", "name": "precompile_header" }, @@ -260,6 +262,11 @@ "type": "compilerSupportsFlag", "flag": "-fuse-ld=gold" }, + "optimize_debug": { + "label": "-Og support", + "type": "compilerSupportsFlag", + "flag": "-Og" + }, "enable_new_dtags": { "label": "new dtags support", "type": "linkerSupportsFlag", @@ -308,6 +315,11 @@ "type": "compile", "test": "common/sse4_2" }, + "f16c": { + "label": "F16C instructions", + "type": "compile", + "test": "common/f16c" + }, "avx": { "label": "AVX instructions", "type": "compile", @@ -398,6 +410,11 @@ "type": "compile", "test": "unix/posix_fallocate" }, + "alloca": { + "label": "alloca()", + "type": "compile", + "test": "common/alloca" + }, "stack_protector": { "label": "stack protection", "type": "compilerSupportsFlag", @@ -430,7 +447,8 @@ }, "shared": { "label": "Building shared libraries", - "condition": "!config.uikit && !config.integrity", + "autoDetect": "!config.uikit", + "condition": "!config.integrity", "output": [ "shared", "publicFeature", @@ -449,7 +467,7 @@ "cross_compile": { "label": "Cross compiling", "condition": "call.crossCompile", - "output": [ "publicConfig", "privateConfig", "crossCompile" ] + "output": [ "publicConfig", "privateConfig", "publicFeature", "crossCompile" ] }, "cxx11default": { "label": "Compiler defaults to C++11 or higher", @@ -469,9 +487,14 @@ }, "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" ] }, + "optimize_debug": { + "label": "Optimize debug build", + "condition": "!config.msvc && (features.debug || features.debug_and_release) && tests.optimize_debug", + "output": [ "privateConfig" ] + }, "architecture": { "label": "Architecture", "output": [ "architecture" ] @@ -529,6 +552,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 == ''", @@ -752,6 +781,14 @@ { "type": "define", "name": "QT_COMPILER_SUPPORTS_AVX", "value": 1 } ] }, + "f16c": { + "label": "F16C", + "condition": "features.avx && tests.f16c", + "output": [ + "privateConfig", + { "type": "define", "name": "QT_COMPILER_SUPPORTS_F16C", "value": 1 } + ] + }, "avx2": { "label": "AVX2", "condition": "features.avx && tests.avx2", @@ -866,15 +903,16 @@ "condition": "tests.posix_fallocate", "output": [ "privateFeature" ] }, + "alloca": { + "label": "alloca()", + "condition": "tests.alloca", + "output": [ "privateFeature" ] + }, "stack-protector-strong": { "label": "stack protection", "condition": "config.qnx && tests.stack_protector", "output": [ "publicQtConfig" ] }, - "accessibility": { - "label": "Accessibility", - "output": [ "publicFeature", "feature" ] - }, "system-zlib": { "label": "Using system zlib", "condition": "libs.zlib", @@ -932,6 +970,7 @@ }, "widgets": { "label": "Qt Widgets", + "autoDetect": "!config.tvos && !config.watchos", "condition": "features.gui", "output": [ "privateFeature", @@ -1039,11 +1078,6 @@ or compile needed modules into the library." Configure with '-qreal float' to create a build that is binary-compatible with 5.1." }, { - "type": "warning", - "condition": "!features.accessibility", - "message": "Accessibility disabled. This configuration of Qt is unsupported." - }, - { "type": "error", "condition": "!features.stl", "message": "Qt requires a compliant STL library." @@ -1061,6 +1095,11 @@ Configure with '-qreal float' to create a build that is binary-compatible with 5 "message": "Mode", "type": "buildMode" }, + { + "type": "feature", + "args": "optimize_debug", + "condition": "!config.msvc && (features.debug || features.debug_and_release)" + }, "shared", { "message": "Using C++ standard", @@ -1087,7 +1126,7 @@ Configure with '-qreal float' to create a build that is binary-compatible with 5 { "message": "AVX", "type": "featureList", - "args": "avx avx2", + "args": "avx avx2 f16c", "condition": "(arch.i386 || arch.x86_64)" }, { @@ -1121,6 +1160,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" } ] }, { @@ -1139,7 +1183,6 @@ Configure with '-qreal float' to create a build that is binary-compatible with 5 }, { "section": "Support enabled for", "entries": [ - "accessibility", "pkg-config", "qml-debug", "libudev", |