1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename description => label in configure.json

Browse Source 
"description" suggests something slightly longer.

this may seem like a gratuitous change, but the upcoming replacement of
the old feature system clarifies makes it seem much less so.

Change-Id: Ibe702e01cb146b59127bf1f990b4acaef1c61d55
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Oswald Buddenhagen 2016-08-26 21:10:56 +02:00 committed by Lars Knoll
parent 2d3c73fcfe
commit b754b2815d
9 changed files with 362 additions and 362 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

272
configure.json
View File

@ -149,7 +149,7 @@
"libraries": { "libraries": {
"zlib": { "zlib": {
"description": "zlib", "label": "zlib",
"test": "unix/zlib", "test": "unix/zlib",
"sources": [ "sources": [
{ "libs": "-lzdll", "condition": "config.msvc" }, { "libs": "-lzdll", "condition": "config.msvc" },
@ -157,7 +157,7 @@
] ]
}, },
"alsa": { "alsa": {
"description": "ALSA", "label": "ALSA",
"export": "", "export": "",
"test": "unix/alsa", "test": "unix/alsa",
"sources": [ "sources": [
@ -165,14 +165,14 @@
] ]
}, },
"pulseaudio": { "pulseaudio": {
"description": "PulseAudio >= 0.9.10", "label": "PulseAudio >= 0.9.10",
"test": "unix/pulseaudio", "test": "unix/pulseaudio",
"sources": [ "sources": [
{ "type": "pkgConfig", "args": "libpulse >= 0.9.10 libpulse-mainloop-glib" } { "type": "pkgConfig", "args": "libpulse >= 0.9.10 libpulse-mainloop-glib" }
] ]
}, },
"gstreamer_1_0": { "gstreamer_1_0": {
"description": "GStreamer 1.0", "label": "GStreamer 1.0",
"export": "", "export": "",
"test": "unix/gstreamer", "test": "unix/gstreamer",
"sources": [ "sources": [
@ -181,7 +181,7 @@
] ]
}, },
"gstreamer_0_10": { "gstreamer_0_10": {
"description": "GStreamer 0.10", "label": "GStreamer 0.10",
"export": "", "export": "",
"test": "unix/gstreamer", "test": "unix/gstreamer",
"sources": [ "sources": [
@ -190,7 +190,7 @@
] ]
}, },
"dbus": { "dbus": {
"description": "D-Bus >= 1.2", "label": "D-Bus >= 1.2",
"test": "unix/dbus", "test": "unix/dbus",
"sources": [ "sources": [
{ "type": "pkgConfig", "args": "dbus-1 >= 1.2" }, { "type": "pkgConfig", "args": "dbus-1 >= 1.2" },
@ -206,7 +206,7 @@
] ]
}, },
"host_dbus": { "host_dbus": {
"description": "D-Bus >= 1.2 (host)", "label": "D-Bus >= 1.2 (host)",
"export": "", "export": "",
"sources": [ "sources": [
{ "type": "pkgConfig", "host": true, "args": "dbus-1 >= 1.2" }, { "type": "pkgConfig", "host": true, "args": "dbus-1 >= 1.2" },
@ -214,7 +214,7 @@
] ]
}, },
"libudev": { "libudev": {
"description": "udev", "label": "udev",
"test": "unix/libudev", "test": "unix/libudev",
"sources": [ "sources": [
{ "type": "pkgConfig", "args": "libudev" }, { "type": "pkgConfig", "args": "libudev" },
@ -239,18 +239,18 @@
"tests": { "tests": {
"verifyspec": { "verifyspec": {
"description": "valid makespec", "label": "valid makespec",
"type": "verifySpec", "type": "verifySpec",
"test": "common/verifyspec" "test": "common/verifyspec"
}, },
"architecture": { "architecture": {
"description": "target architecture", "label": "target architecture",
"type": "architecture", "type": "architecture",
"test": "arch", "test": "arch",
"log": "arch" "log": "arch"
}, },
"host_architecture": { "host_architecture": {
"description": "host architecture", "label": "host architecture",
"type": "architecture", "type": "architecture",
"test": "arch", "test": "arch",
"host": true, "host": true,
@ -258,60 +258,60 @@
"log": "arch" "log": "arch"
}, },
"GNUmake": { "GNUmake": {
"description": "GNU make", "label": "GNU make",
"type": "gnumake" "type": "gnumake"
}, },
"pkg-config": { "pkg-config": {
"description": "pkg-config", "label": "pkg-config",
"type": "detectPkgConfig" "type": "detectPkgConfig"
}, },
"stl": { "stl": {
"description": "STL compatibility", "label": "STL compatibility",
"type": "compile", "type": "compile",
"test": "unix/stl" "test": "unix/stl"
}, },
"c++14": { "c++14": {
"description": "C++14 support", "label": "C++14 support",
"type": "compile", "type": "compile",
"test": "common/c++14" "test": "common/c++14"
}, },
"c++1z": { "c++1z": {
"description": "C++1z support", "label": "C++1z support",
"type": "compile", "type": "compile",
"test": "common/c++1z" "test": "common/c++1z"
}, },
"cxx98default": { "cxx98default": {
"description": "compiler defaulting to C++98", "label": "compiler defaulting to C++98",
"type": "compile", "type": "compile",
"test": "common/c++98default" "test": "common/c++98default"
}, },
"compiler": { "compiler": {
"description": "Compiler", "label": "Compiler",
"type": "checkCompiler", "type": "checkCompiler",
"log": "compilerDescription" "log": "compilerDescription"
}, },
"precompile_header": { "precompile_header": {
"description": "precompiled header support", "label": "precompiled header support",
"type": "compile", "type": "compile",
"test": "common/pch" "test": "common/pch"
}, },
"use_gold_linker": { "use_gold_linker": {
"description": "gold linker", "label": "gold linker",
"type": "compilerSupportsFlag", "type": "compilerSupportsFlag",
"flag": "-fuse-ld=gold" "flag": "-fuse-ld=gold"
}, },
"enable_new_dtags": { "enable_new_dtags": {
"description": "new dtags support", "label": "new dtags support",
"type": "linkerSupportsFlag", "type": "linkerSupportsFlag",
"flag": "--enable-new-dtags" "flag": "--enable-new-dtags"
}, },
"reduce_exports": { "reduce_exports": {
"description": "symbol visibility support", "label": "symbol visibility support",
"type": "compile", "type": "compile",
"test": "unix/reduce_exports" "test": "unix/reduce_exports"
}, },
"reduce_relocations": { "reduce_relocations": {
"description": "-Bsymbolic-functions support", "label": "-Bsymbolic-functions support",
"type": "compile", "type": "compile",
"test": "unix/reduce_relocs" "test": "unix/reduce_relocs"
}, },
@ -319,140 +319,140 @@
"type": "buildParts" "type": "buildParts"
}, },
"separate_debug_info": { "separate_debug_info": {
"description": "separate debug information support", "label": "separate debug information support",
"type": "compile", "type": "compile",
"test": "unix/objcopy" "test": "unix/objcopy"
}, },
"sse2": { "sse2": {
"description": "SSE2 instructions", "label": "SSE2 instructions",
"type": "compile", "type": "compile",
"test": "common/sse2" "test": "common/sse2"
}, },
"sse3": { "sse3": {
"description": "SSE3 instructions", "label": "SSE3 instructions",
"type": "compile", "type": "compile",
"test": "common/sse3" "test": "common/sse3"
}, },
"ssse3": { "ssse3": {
"description": "SSSE3 instructions", "label": "SSSE3 instructions",
"type": "compile", "type": "compile",
"test": "common/ssse3" "test": "common/ssse3"
}, },
"sse4_1": { "sse4_1": {
"description": "SSE4.1 instructions", "label": "SSE4.1 instructions",
"type": "compile", "type": "compile",
"test": "common/sse4_1" "test": "common/sse4_1"
}, },
"sse4_2": { "sse4_2": {
"description": "SSE4.2 instructions", "label": "SSE4.2 instructions",
"type": "compile", "type": "compile",
"test": "common/sse4_2" "test": "common/sse4_2"
}, },
"avx": { "avx": {
"description": "AVX instructions", "label": "AVX instructions",
"type": "compile", "type": "compile",
"test": "common/avx" "test": "common/avx"
}, },
"avx_apple_clang": { "avx_apple_clang": {
"description": "bugfree AVX support in compiler", "label": "bugfree AVX support in compiler",
"type": "avx_test_apple_clang" "type": "avx_test_apple_clang"
}, },
"avx2": { "avx2": {
"description": "AVX2 instructions", "label": "AVX2 instructions",
"type": "compile", "type": "compile",
"test": "common/avx2" "test": "common/avx2"
}, },
"avx512f": { "avx512f": {
"description": "AVX512 F instructions", "label": "AVX512 F instructions",
"type": "compile", "type": "compile",
"test": "common/avx512", "test": "common/avx512",
"args": "AVX512=F" "args": "AVX512=F"
}, },
"avx512er": { "avx512er": {
"description": "AVX512 ER instructions", "label": "AVX512 ER instructions",
"type": "compile", "type": "compile",
"test": "common/avx512", "test": "common/avx512",
"args": "AVX512=ER" "args": "AVX512=ER"
}, },
"avx512cd": { "avx512cd": {
"description": "AVX512 CD instructions", "label": "AVX512 CD instructions",
"type": "compile", "type": "compile",
"test": "common/avx512", "test": "common/avx512",
"args": "AVX512=CD" "args": "AVX512=CD"
}, },
"avx512pf": { "avx512pf": {
"description": "AVX512 PF instructions", "label": "AVX512 PF instructions",
"type": "compile", "type": "compile",
"test": "common/avx512", "test": "common/avx512",
"args": "AVX512=PF" "args": "AVX512=PF"
}, },
"avx512dq": { "avx512dq": {
"description": "AVX512 DQ instructions", "label": "AVX512 DQ instructions",
"type": "compile", "type": "compile",
"test": "common/avx512", "test": "common/avx512",
"args": "AVX512=DQ" "args": "AVX512=DQ"
}, },
"avx512bw": { "avx512bw": {
"description": "AVX512 BW instructions", "label": "AVX512 BW instructions",
"type": "compile", "type": "compile",
"test": "common/avx512", "test": "common/avx512",
"args": "AVX512=BW" "args": "AVX512=BW"
}, },
"avx512vl": { "avx512vl": {
"description": "AVX512 VL instructions", "label": "AVX512 VL instructions",
"type": "compile", "type": "compile",
"test": "common/avx512", "test": "common/avx512",
"args": "AVX512=VL" "args": "AVX512=VL"
}, },
"avx512ifma": { "avx512ifma": {
"description": "AVX512 IFMA instructions", "label": "AVX512 IFMA instructions",
"type": "compile", "type": "compile",
"test": "common/avx512", "test": "common/avx512",
"args": "AVX512=IFMA" "args": "AVX512=IFMA"
}, },
"avx512vbmi": { "avx512vbmi": {
"description": "AVX512 VBMI instructions", "label": "AVX512 VBMI instructions",
"type": "compile", "type": "compile",
"test": "common/avx512", "test": "common/avx512",
"args": "AVX512=VBMI" "args": "AVX512=VBMI"
}, },
"mips_dsp": { "mips_dsp": {
"description": "MIPS DSP instructions", "label": "MIPS DSP instructions",
"type": "compile", "type": "compile",
"test": "unix/mips_dsp" "test": "unix/mips_dsp"
}, },
"mips_dspr2": { "mips_dspr2": {
"description": "MIPS DSPr2 instructions", "label": "MIPS DSPr2 instructions",
"type": "compile", "type": "compile",
"test": "common/mips_dspr2" "test": "common/mips_dspr2"
}, },
"neon": { "neon": {
"description": "NEON instructions", "label": "NEON instructions",
"type": "neon" "type": "neon"
}, },
"mremap": { "mremap": {
"description": "mremap()", "label": "mremap()",
"type": "compile", "type": "compile",
"test": "unix/mremap" "test": "unix/mremap"
}, },
"posix_fallocate": { "posix_fallocate": {
"description": "POSIX fallocate()", "label": "POSIX fallocate()",
"type": "compile", "type": "compile",
"test": "unix/posix_fallocate" "test": "unix/posix_fallocate"
}, },
"stack_protector": { "stack_protector": {
"description": "stack protection", "label": "stack protection",
"type": "compilerSupportsFlag", "type": "compilerSupportsFlag",
"test": "-fstack-protector-strong" "test": "-fstack-protector-strong"
}, },
"incredibuild_xge": { "incredibuild_xge": {
"description": "IncrediBuild", "label": "IncrediBuild",
"type": "files", "type": "files",
"files": [ "BuildConsole.exe", "xgConsole.exe" ] "files": [ "BuildConsole.exe", "xgConsole.exe" ]
}, },
"wmf": { "wmf": {
"description": "WMF", "label": "WMF",
"type": "files", "type": "files",
"files": [ "mfapi.h", "mf.lib" ] "files": [ "mfapi.h", "mf.lib" ]
} }
@ -460,7 +460,7 @@
"features": { "features": {
"shared": { "shared": {
"description": "Building shared libraries", "label": "Building shared libraries",
"condition": "!config.uikit && !config.integrity", "condition": "!config.uikit && !config.integrity",
"output": [ "output": [
"shared", "shared",
@ -478,12 +478,12 @@
] ]
}, },
"cross_compile": { "cross_compile": {
"description": "Cross compiling", "label": "Cross compiling",
"condition": "call.crossCompile", "condition": "call.crossCompile",
"output": [ "publicConfig", "privateConfig" ] "output": [ "publicConfig", "privateConfig" ]
}, },
"cxx98default": { "cxx98default": {
"description": "Compiler defaults to C++98", "label": "Compiler defaults to C++98",
"condition": "tests.cxx98default", "condition": "tests.cxx98default",
"output": [ { "type": "publicConfig", "name": "c++11" } ] "output": [ { "type": "publicConfig", "name": "c++11" } ]
}, },
@ -499,16 +499,16 @@
"condition": "input.qmakeArgs != ''" "condition": "input.qmakeArgs != ''"
}, },
"use_gold_linker": { "use_gold_linker": {
"description": "Using gold linker", "label": "Using gold linker",
"condition": "!config.msvc && tests.use_gold_linker", "condition": "!config.msvc && tests.use_gold_linker",
"output": [ "privateConfig", "useGoldLinker" ] "output": [ "privateConfig", "useGoldLinker" ]
}, },
"architecture": { "architecture": {
"description": "Architecture", "label": "Architecture",
"output": [ "architecture" ] "output": [ "architecture" ]
}, },
"pkg-config": { "pkg-config": {
"description": "Using pkg-config", "label": "Using pkg-config",
"autoDetect": "!config.darwin && !config.win32", "autoDetect": "!config.darwin && !config.win32",
"condition": "tests.pkg-config", "condition": "tests.pkg-config",
"output": [ "output": [
@ -518,11 +518,11 @@
] ]
}, },
"verifyspec": { "verifyspec": {
"description": "Have valid makespec", "label": "Have valid makespec",
"condition": "tests.verifyspec" "condition": "tests.verifyspec"
}, },
"developer-build": { "developer-build": {
"description": "Developer build", "label": "Developer build",
"autoDetect": false, "autoDetect": false,
"output": [ "output": [
{ "type": "define", "name": "QT_BUILD_INTERNAL" }, { "type": "define", "name": "QT_BUILD_INTERNAL" },
@ -531,22 +531,22 @@
] ]
}, },
"debug": { "debug": {
"description": "Build for debugging", "label": "Build for debugging",
"autoDetect": "features.developer-build || config.win32 || config.darwin" "autoDetect": "features.developer-build || config.win32 || config.darwin"
}, },
"debug_and_release": { "debug_and_release": {
"description": "Compile libs in debug and release mode", "label": "Compile libs in debug and release mode",
"autoDetect": "input.debug == ''", "autoDetect": "input.debug == ''",
"condition": "config.darwin || config.win32", "condition": "config.darwin || config.win32",
"output": [ "publicFeature", "publicQtConfig", "debugAndRelease" ] "output": [ "publicFeature", "publicQtConfig", "debugAndRelease" ]
}, },
"force_debug_info": { "force_debug_info": {
"description": "Add debug info in release mode", "label": "Add debug info in release mode",
"autoDetect": false, "autoDetect": false,
"output": [ "privateConfig" ] "output": [ "privateConfig" ]
}, },
"separate_debug_info": { "separate_debug_info": {
"description": "Split off debug information", "label": "Split off debug information",
"autoDetect": false, "autoDetect": false,
"condition": [ "condition": [
"features.shared", "features.shared",
@ -556,11 +556,11 @@
"output": [ "publicFeature", "publicQtConfig" ] "output": [ "publicFeature", "publicQtConfig" ]
}, },
"release_tools": { "release_tools": {
"description": "Compile tools in release mode", "label": "Compile tools in release mode",
"output": [ "privateFeature", "publicQtConfig" ] "output": [ "privateFeature", "publicQtConfig" ]
}, },
"simulator_and_device": { "simulator_and_device": {
"description": "Build for both simulator and device", "label": "Build for both simulator and device",
"condition": "config.uikit && input.sdk == ''", "condition": "config.uikit && input.sdk == ''",
"output": [ "publicFeature", "publicQtConfig" ] "output": [ "publicFeature", "publicQtConfig" ]
}, },
@ -569,39 +569,39 @@
"output": [ "publicFeature", "publicQtConfig" ] "output": [ "publicFeature", "publicQtConfig" ]
}, },
"rpath": { "rpath": {
"description": "Build with RPATH", "label": "Build with RPATH",
"autoDetect": "var.QMAKE_LFLAGS_RPATH != '' && features.shared", "autoDetect": "var.QMAKE_LFLAGS_RPATH != '' && features.shared",
"output": [ "publicFeature", "publicQtConfig" ] "output": [ "publicFeature", "publicQtConfig" ]
}, },
"rpath_dir": { "rpath_dir": {
"description": "RPATH directory", "label": "RPATH directory",
"enable": "input.rpaths != ''", "enable": "input.rpaths != ''",
"autoDetect": false, "autoDetect": false,
"output": [ { "type": "varAppend", "name": "EXTRA_RPATHS", "value": "input.rpaths" } ] "output": [ { "type": "varAppend", "name": "EXTRA_RPATHS", "value": "input.rpaths" } ]
}, },
"rtti": { "rtti": {
"description": "Build with RTTI", "label": "Build with RTTI",
"comment": "mkspecs/features/win32/default_pre.prf sets no-rtti. Follow default behavior of configure.exe by overriding with rtti.", "comment": "mkspecs/features/win32/default_pre.prf sets no-rtti. Follow default behavior of configure.exe by overriding with rtti.",
"condition": "config.win32", "condition": "config.win32",
"output": [ "publicConfig" ] "output": [ "publicConfig" ]
}, },
"force_asserts": { "force_asserts": {
"description": "Force assertions", "label": "Force assertions",
"autoDetect": false, "autoDetect": false,
"output": [ "publicFeature" ] "output": [ "publicFeature" ]
}, },
"warnings_are_errors": { "warnings_are_errors": {
"description": "WError", "label": "WError",
"autoDetect": "features.developer-build", "autoDetect": "features.developer-build",
"output": [ "privateConfig" ] "output": [ "privateConfig" ]
}, },
"headersclean": { "headersclean": {
"description": "Check for clean headers", "label": "Check for clean headers",
"autoDetect": "features.developer-build", "autoDetect": "features.developer-build",
"output": [ "privateConfig" ] "output": [ "privateConfig" ]
}, },
"framework": { "framework": {
"description": "Build Apple Frameworks", "label": "Build Apple Frameworks",
"condition": "config.darwin && features.shared", "condition": "config.darwin && features.shared",
"output": [ "output": [
{ "type": "define", "name": "QT_MAC_FRAMEWORK_BUILD" }, { "type": "define", "name": "QT_MAC_FRAMEWORK_BUILD" },
@ -611,7 +611,7 @@
] ]
}, },
"largefile": { "largefile": {
"description": "Large file support", "label": "Large file support",
"condition": "!config.android && !config.integrity && !config.winrt", "condition": "!config.android && !config.integrity && !config.winrt",
"output": [ "output": [
"privateConfig", "privateConfig",
@ -619,59 +619,59 @@
] ]
}, },
"testcocoon": { "testcocoon": {
"description": "Testcocoon support", "label": "Testcocoon support",
"autoDetect": false, "autoDetect": false,
"output": [ "publicConfig" ] "output": [ "publicConfig" ]
}, },
"gcov": { "gcov": {
"description": "gcov support", "label": "gcov support",
"autoDetect": false, "autoDetect": false,
"output": [ "publicConfig" ] "output": [ "publicConfig" ]
}, },
"silent": { "silent": {
"description": "Silent build", "label": "Silent build",
"autoDetect": false, "autoDetect": false,
"output": [ "privateConfig" ] "output": [ "privateConfig" ]
}, },
"sanitize_address": { "sanitize_address": {
"description": "Addresses", "label": "Addresses",
"autoDetect": false, "autoDetect": false,
"output": [ "publicConfig" ] "output": [ "publicConfig" ]
}, },
"sanitize_thread": { "sanitize_thread": {
"description": "Threads", "label": "Threads",
"autoDetect": false, "autoDetect": false,
"output": [ "publicConfig" ] "output": [ "publicConfig" ]
}, },
"sanitize_memory": { "sanitize_memory": {
"description": "Memory", "label": "Memory",
"autoDetect": false, "autoDetect": false,
"output": [ "publicConfig" ] "output": [ "publicConfig" ]
}, },
"sanitize_undefined": { "sanitize_undefined": {
"description": "Undefined", "label": "Undefined",
"autoDetect": false, "autoDetect": false,
"output": [ "publicConfig" ] "output": [ "publicConfig" ]
}, },
"sanitizer": { "sanitizer": {
"description": "Sanitizers", "label": "Sanitizers",
"condition": "features.sanitize_address || features.sanitize_thread || features.sanitize_memory || features.sanitize_undefined", "condition": "features.sanitize_address || features.sanitize_thread || features.sanitize_memory || features.sanitize_undefined",
"output": [ "publicConfig" ] "output": [ "publicConfig" ]
}, },
"GNUmake": { "GNUmake": {
"description": "GNU make", "label": "GNU make",
"autoDetect": false, "autoDetect": false,
"condition": "tests.GNUmake", "condition": "tests.GNUmake",
"output": [ "privateConfig" ] "output": [ "privateConfig" ]
}, },
"plugin-manifests": { "plugin-manifests": {
"description": "Embed manifests in plugins", "label": "Embed manifests in plugins",
"emitIf": "config.win32", "emitIf": "config.win32",
"autoDetect": false, "autoDetect": false,
"output": [ { "type": "publicConfig", "negative": true, "name": "no_plugin_manifest" } ] "output": [ { "type": "publicConfig", "negative": true, "name": "no_plugin_manifest" } ]
}, },
"profile": { "profile": {
"description": "GNU profiling support", "label": "GNU profiling support",
"autoDetect": false, "autoDetect": false,
"output": [ "output": [
{ "type": "varAppend", "name": "QMAKE_CFLAGS", "value": "'-pg'" }, { "type": "varAppend", "name": "QMAKE_CFLAGS", "value": "'-pg'" },
@ -680,36 +680,36 @@
] ]
}, },
"strip": { "strip": {
"description": "Strip binaries", "label": "Strip binaries",
"condition": "!features.profile", "condition": "!features.profile",
"output": [ { "type": "privateConfig", "negative": true, "name": "nostrip" } ] "output": [ { "type": "privateConfig", "negative": true, "name": "nostrip" } ]
}, },
"stl": { "stl": {
"description": "STL compatibility", "label": "STL compatibility",
"condition": "tests.stl", "condition": "tests.stl",
"output": [ "publicQtConfig" ] "output": [ "publicQtConfig" ]
}, },
"c++11": { "c++11": {
"description": "C++11", "label": "C++11",
"output": [ "publicFeature", "publicQtConfig" ] "output": [ "publicFeature", "publicQtConfig" ]
}, },
"c++14": { "c++14": {
"description": "C++14", "label": "C++14",
"condition": "features.c++11 && tests.c++14", "condition": "features.c++11 && tests.c++14",
"output": [ "publicFeature", "publicQtConfig" ] "output": [ "publicFeature", "publicQtConfig" ]
}, },
"c++1z": { "c++1z": {
"description": "C++1z", "label": "C++1z",
"condition": "features.c++14 && tests.c++1z", "condition": "features.c++14 && tests.c++1z",
"output": [ "publicFeature", "publicQtConfig" ] "output": [ "publicFeature", "publicQtConfig" ]
}, },
"compiler": { "compiler": {
"description": "Compiler version", "label": "Compiler version",
"condition": "tests.compiler", "condition": "tests.compiler",
"output": [ "compilerVersion" ] "output": [ "compilerVersion" ]
}, },
"precompile_header": { "precompile_header": {
"description": "Using precompiled headers", "label": "Using precompiled headers",
"condition": "config.msvc || tests.precompile_header", "condition": "config.msvc || tests.precompile_header",
"output": [ "output": [
"privateConfig", "privateConfig",
@ -717,17 +717,17 @@
] ]
}, },
"ltcg": { "ltcg": {
"description": "Using LTCG", "label": "Using LTCG",
"autoDetect": false, "autoDetect": false,
"output": [ "privateConfig" ] "output": [ "privateConfig" ]
}, },
"enable_new_dtags": { "enable_new_dtags": {
"description": "Using new DTAGS", "label": "Using new DTAGS",
"condition": "config.linux && tests.enable_new_dtags", "condition": "config.linux && tests.enable_new_dtags",
"output": [ "privateConfig" ] "output": [ "privateConfig" ]
}, },
"reduce_exports": { "reduce_exports": {
"description": "Reduce amount of exported symbols", "label": "Reduce amount of exported symbols",
"condition": "!config.win32 && tests.reduce_exports", "condition": "!config.win32 && tests.reduce_exports",
"output": [ "output": [
"privateFeature", "privateFeature",
@ -736,7 +736,7 @@
] ]
}, },
"reduce_relocations": { "reduce_relocations": {
"description": "Reduce amount of relocations", "label": "Reduce amount of relocations",
"condition": "!config.win32 && tests.reduce_relocations", "condition": "!config.win32 && tests.reduce_relocations",
"output": [ "output": [
"privateFeature", "privateFeature",
@ -745,7 +745,7 @@
] ]
}, },
"sse2": { "sse2": {
"description": "SSE2", "label": "SSE2",
"condition": "(arch.i386 || arch.x86_64) && tests.sse2", "condition": "(arch.i386 || arch.x86_64) && tests.sse2",
"output": [ "output": [
"privateConfig", "privateConfig",
@ -754,7 +754,7 @@
] ]
}, },
"sse3": { "sse3": {
"description": "SSE3", "label": "SSE3",
"condition": "features.sse2 && tests.sse3", "condition": "features.sse2 && tests.sse3",
"output": [ "output": [
"privateConfig", "privateConfig",
@ -762,7 +762,7 @@
] ]
}, },
"ssse3": { "ssse3": {
"description": "SSSE3", "label": "SSSE3",
"condition": "features.sse3 && tests.ssse3", "condition": "features.sse3 && tests.ssse3",
"output": [ "output": [
"privateConfig", "privateConfig",
@ -770,7 +770,7 @@
] ]
}, },
"sse4_1": { "sse4_1": {
"description": "SSE4.1", "label": "SSE4.1",
"condition": "features.ssse3 && tests.sse4_1", "condition": "features.ssse3 && tests.sse4_1",
"output": [ "output": [
"privateConfig", "privateConfig",
@ -778,7 +778,7 @@
] ]
}, },
"sse4_2": { "sse4_2": {
"description": "SSE4.2", "label": "SSE4.2",
"condition": "features.sse4_1 && tests.sse4_2", "condition": "features.sse4_1 && tests.sse4_2",
"output": [ "output": [
"privateConfig", "privateConfig",
@ -786,7 +786,7 @@
] ]
}, },
"avx": { "avx": {
"description": "AVX", "label": "AVX",
"condition": "features.sse4_2 && tests.avx && tests.avx_apple_clang", "condition": "features.sse4_2 && tests.avx && tests.avx_apple_clang",
"output": [ "output": [
"privateConfig", "privateConfig",
@ -794,7 +794,7 @@
] ]
}, },
"avx2": { "avx2": {
"description": "AVX2", "label": "AVX2",
"condition": "features.avx && tests.avx2", "condition": "features.avx && tests.avx2",
"output": [ "output": [
"privateConfig", "privateConfig",
@ -802,7 +802,7 @@
] ]
}, },
"avx512f": { "avx512f": {
"description": "F", "label": "F",
"condition": "features.avx2 && tests.avx512f", "condition": "features.avx2 && tests.avx512f",
"output": [ "output": [
"privateConfig", "privateConfig",
@ -810,7 +810,7 @@
] ]
}, },
"avx512er": { "avx512er": {
"description": "ER", "label": "ER",
"condition": "features.avx512f && tests.avx512er", "condition": "features.avx512f && tests.avx512er",
"output": [ "output": [
"privateConfig", "privateConfig",
@ -818,7 +818,7 @@
] ]
}, },
"avx512cd": { "avx512cd": {
"description": "CD", "label": "CD",
"condition": "features.avx512f && tests.avx512cd", "condition": "features.avx512f && tests.avx512cd",
"output": [ "output": [
"privateConfig", "privateConfig",
@ -826,7 +826,7 @@
] ]
}, },
"avx512pf": { "avx512pf": {
"description": "PF", "label": "PF",
"condition": "features.avx512f && tests.avx512pf", "condition": "features.avx512f && tests.avx512pf",
"output": [ "output": [
"privateConfig", "privateConfig",
@ -834,7 +834,7 @@
] ]
}, },
"avx512dq": { "avx512dq": {
"description": "DQ", "label": "DQ",
"condition": "features.avx512f && tests.avx512dq", "condition": "features.avx512f && tests.avx512dq",
"output": [ "output": [
"privateConfig", "privateConfig",
@ -842,7 +842,7 @@
] ]
}, },
"avx512bw": { "avx512bw": {
"description": "BW", "label": "BW",
"condition": "features.avx512f && tests.avx512bw", "condition": "features.avx512f && tests.avx512bw",
"output": [ "output": [
"privateConfig", "privateConfig",
@ -850,7 +850,7 @@
] ]
}, },
"avx512vl": { "avx512vl": {
"description": "VL", "label": "VL",
"condition": "features.avx512f && tests.avx512vl", "condition": "features.avx512f && tests.avx512vl",
"output": [ "output": [
"privateConfig", "privateConfig",
@ -858,7 +858,7 @@
] ]
}, },
"avx512ifma": { "avx512ifma": {
"description": "IFMA", "label": "IFMA",
"condition": "features.avx512f && tests.avx512ifma", "condition": "features.avx512f && tests.avx512ifma",
"output": [ "output": [
"privateConfig", "privateConfig",
@ -866,7 +866,7 @@
] ]
}, },
"avx512vbmi": { "avx512vbmi": {
"description": "VBMI", "label": "VBMI",
"condition": "features.avx512f && tests.avx512vbmi", "condition": "features.avx512f && tests.avx512vbmi",
"output": [ "output": [
"privateConfig", "privateConfig",
@ -874,7 +874,7 @@
] ]
}, },
"mips_dsp": { "mips_dsp": {
"description": "DSP", "label": "DSP",
"condition": "arch.mips && tests.mips_dsp", "condition": "arch.mips && tests.mips_dsp",
"output": [ "output": [
"privateConfig", "privateConfig",
@ -882,7 +882,7 @@
] ]
}, },
"mips_dspr2": { "mips_dspr2": {
"description": "DSPr2", "label": "DSPr2",
"condition": "arch.mips && tests.mips_dspr2", "condition": "arch.mips && tests.mips_dspr2",
"output": [ "output": [
"privateConfig", "privateConfig",
@ -890,7 +890,7 @@
] ]
}, },
"neon": { "neon": {
"description": "NEON", "label": "NEON",
"condition": "(arch.arm || arch.arm64) && tests.neon", "condition": "(arch.arm || arch.arm64) && tests.neon",
"output": [ "output": [
"privateConfig", "privateConfig",
@ -898,57 +898,57 @@
] ]
}, },
"alsa": { "alsa": {
"description": "ALSA", "label": "ALSA",
"condition": "libs.alsa", "condition": "libs.alsa",
"output": [ "feature" ] "output": [ "feature" ]
}, },
"mremap": { "mremap": {
"description": "mremap()", "label": "mremap()",
"condition": "tests.mremap", "condition": "tests.mremap",
"output": [ "feature" ] "output": [ "feature" ]
}, },
"posix_fallocate": { "posix_fallocate": {
"description": "POSIX fallocate()", "label": "POSIX fallocate()",
"condition": "tests.posix_fallocate", "condition": "tests.posix_fallocate",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"stack-protector-strong": { "stack-protector-strong": {
"description": "stack protection", "label": "stack protection",
"condition": "config.qnx && tests.stack_protector", "condition": "config.qnx && tests.stack_protector",
"output": [ "publicQtConfig" ] "output": [ "publicQtConfig" ]
}, },
"accessibility": { "accessibility": {
"description": "Accessibility", "label": "Accessibility",
"output": [ "publicFeature", "feature" ] "output": [ "publicFeature", "feature" ]
}, },
"pulseaudio": { "pulseaudio": {
"description": "PulseAudio", "label": "PulseAudio",
"condition": "libs.pulseaudio", "condition": "libs.pulseaudio",
"output": [ "feature" ] "output": [ "feature" ]
}, },
"system-zlib": { "system-zlib": {
"description": "Using system zlib", "label": "Using system zlib",
"condition": "libs.zlib", "condition": "libs.zlib",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"concurrent": { "concurrent": {
"description": "Qt Concurrent", "label": "Qt Concurrent",
"output": [ "publicFeature", "feature" ] "output": [ "publicFeature", "feature" ]
}, },
"dbus": { "dbus": {
"description": "Qt D-Bus", "label": "Qt D-Bus",
"autoDetect": "!config.uikit && !config.android && !config.winrt", "autoDetect": "!config.uikit && !config.android && !config.winrt",
"output": [ "privateFeature", "feature" ] "output": [ "privateFeature", "feature" ]
}, },
"dbus-linked": { "dbus-linked": {
"description": "Qt D-Bus directly linked to libdbus", "label": "Qt D-Bus directly linked to libdbus",
"enable": "input.dbus == 'linked'", "enable": "input.dbus == 'linked'",
"disable": "input.dbus == 'runtime'", "disable": "input.dbus == 'runtime'",
"condition": "features.dbus && libs.dbus", "condition": "features.dbus && libs.dbus",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"host-dbus": { "host-dbus": {
"description": "Qt D-Bus (Host)", "label": "Qt D-Bus (Host)",
"autoDetect": "!config.android", "autoDetect": "!config.android",
"condition": "libs.host_dbus", "condition": "libs.host_dbus",
"output": [ { "type": "varAppend", "name": "QT_HOST_CFLAGS_DBUS", "value": "libs.host_dbus.cflags", "eval": "true" } ] "output": [ { "type": "varAppend", "name": "QT_HOST_CFLAGS_DBUS", "value": "libs.host_dbus.cflags", "eval": "true" } ]
@ -957,18 +957,18 @@
"output": [ { "type": "varAppend", "name": "QT_BUILD_PARTS", "value": "tests.build_parts.value" } ] "output": [ { "type": "varAppend", "name": "QT_BUILD_PARTS", "value": "tests.build_parts.value" } ]
}, },
"qreal": { "qreal": {
"description": "Type for qreal", "label": "Type for qreal",
"output": [ "qreal" ] "output": [ "qreal" ]
}, },
"gui": { "gui": {
"description": "Qt Gui", "label": "Qt Gui",
"output": [ "output": [
"privateFeature", "privateFeature",
{ "type": "publicQtConfig", "negative": true } { "type": "publicQtConfig", "negative": true }
] ]
}, },
"widgets": { "widgets": {
"description": "Qt Widgets", "label": "Qt Widgets",
"condition": "features.gui", "condition": "features.gui",
"output": [ "output": [
"privateFeature", "privateFeature",
@ -977,57 +977,57 @@
] ]
}, },
"libudev": { "libudev": {
"description": "udev", "label": "udev",
"condition": "libs.libudev", "condition": "libs.libudev",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"gstreamer-1_0": { "gstreamer-1_0": {
"description": "GStreamer 1.0", "label": "GStreamer 1.0",
"disable": "input.gstreamer == '0.10' || input.gstreamer == 'no'", "disable": "input.gstreamer == '0.10' || input.gstreamer == 'no'",
"enable": "input.gstreamer == '1.0'", "enable": "input.gstreamer == '1.0'",
"condition": "libs.gstreamer_1_0", "condition": "libs.gstreamer_1_0",
"output": [ { "type": "publicQtConfig", "name": "gstreamer-1.0" } ] "output": [ { "type": "publicQtConfig", "name": "gstreamer-1.0" } ]
}, },
"gstreamer-0_10": { "gstreamer-0_10": {
"description": "GStreamer 0.10", "label": "GStreamer 0.10",
"disable": "input.gstreamer == 'no'", "disable": "input.gstreamer == 'no'",
"enable": "input.gstreamer == '0.10'", "enable": "input.gstreamer == '0.10'",
"condition": "!features.gstreamer-1_0 && libs.gstreamer_0_10", "condition": "!features.gstreamer-1_0 && libs.gstreamer_0_10",
"output": [ { "type": "publicQtConfig", "name": "gstreamer-0.10" } ] "output": [ { "type": "publicQtConfig", "name": "gstreamer-0.10" } ]
}, },
"audio-backend": { "audio-backend": {
"description": "Audio backend", "label": "Audio backend",
"output": [ "publicQtConfig" ] "output": [ "publicQtConfig" ]
}, },
"qml-debug": { "qml-debug": {
"description": "QML debugging", "label": "QML debugging",
"output": [ { "type": "publicQtConfig", "negative": true } ] "output": [ { "type": "publicQtConfig", "negative": true } ]
}, },
"compile_examples": { "compile_examples": {
"description": "Compile examples", "label": "Compile examples",
"output": [ "privateConfig" ] "output": [ "privateConfig" ]
}, },
"incredibuild_xge": { "incredibuild_xge": {
"description": "IncrediBuild", "label": "IncrediBuild",
"emitIf": "var.QMAKE_HOST.os == 'Windows'", "emitIf": "var.QMAKE_HOST.os == 'Windows'",
"condition": "tests.incredibuild_xge", "condition": "tests.incredibuild_xge",
"output": [ "publicConfig" ] "output": [ "publicConfig" ]
}, },
"msvc_mp": { "msvc_mp": {
"description": "Use multiple processors when compiling with MSVC", "label": "Use multiple processors when compiling with MSVC",
"emitIf": "config.msvc", "emitIf": "config.msvc",
"autoDetect": "false", "autoDetect": "false",
"output": [ "privateConfig" ] "output": [ "privateConfig" ]
}, },
"static_runtime": { "static_runtime": {
"description": "Statically link the C/C++ runtime library", "label": "Statically link the C/C++ runtime library",
"emitIf": "config.win32", "emitIf": "config.win32",
"autoDetect": false, "autoDetect": false,
"condition": "!features.shared", "condition": "!features.shared",
"output": [ "publicConfig", "publicQtConfig" ] "output": [ "publicConfig", "publicQtConfig" ]
}, },
"wmf-backend": { "wmf-backend": {
"description": "Windows Media Foundation backend for Qt Multimedia", "label": "Windows Media Foundation backend for Qt Multimedia",
"emitIf": "config.win32", "emitIf": "config.win32",
"autoDetect": false, "autoDetect": false,
"condition": "tests.wmf", "condition": "tests.wmf",

6
configure.pri
View File

@ -66,7 +66,7 @@ defineReplace(qtConfFunc_crossCompile) {
defineTest(qtConfTest_architecture) { defineTest(qtConfTest_architecture) {
!qtConfTest_compile($${1}): \ !qtConfTest_compile($${1}): \
error("Could not determine $$eval($${1}.description). See config.log for details.") error("Could not determine $$eval($${1}.label). See config.log for details.")
test = $$eval($${1}.test) test = $$eval($${1}.test)
test_out_dir = $$shadowed($$QMAKE_CONFIG_TESTS_DIR/$$test) test_out_dir = $$shadowed($$QMAKE_CONFIG_TESTS_DIR/$$test)
@ -77,13 +77,13 @@ defineTest(qtConfTest_architecture) {
else: android:exists($$test_out_dir/libarch.so): \ else: android:exists($$test_out_dir/libarch.so): \
content = $$cat($$test_out_dir/libarch.so, blob) content = $$cat($$test_out_dir/libarch.so, blob)
else: \ else: \
error("$$eval($${1}.description) detection binary not found.") error("$$eval($${1}.label) detection binary not found.")
arch_magic = ".*==Qt=magic=Qt== Architecture:([^\\0]*).*" arch_magic = ".*==Qt=magic=Qt== Architecture:([^\\0]*).*"
subarch_magic = ".*==Qt=magic=Qt== Sub-architecture:([^\\0]*).*" subarch_magic = ".*==Qt=magic=Qt== Sub-architecture:([^\\0]*).*"
!contains(content, $$arch_magic)|!contains(content, $$subarch_magic): \ !contains(content, $$arch_magic)|!contains(content, $$subarch_magic): \
error("$$eval($${1}.description) detection binary does not contain expected data.") error("$$eval($${1}.label) detection binary does not contain expected data.")
$${1}.arch = $$replace(content, $$arch_magic, "\\1") $${1}.arch = $$replace(content, $$arch_magic, "\\1")
$${1}.subarch = $$replace(content, $$subarch_magic, "\\1") $${1}.subarch = $$replace(content, $$subarch_magic, "\\1")

14
mkspecs/features/qt_configure.prf
View File

@ -777,17 +777,17 @@ defineTest(logn) {
} }
defineTest(qtLogTestIntro) { defineTest(qtLogTestIntro) {
description = $$eval($${1}.description) label = $$eval($${1}.label)
isEmpty(description): return() isEmpty(label): return()
msg = "Checking for $${description}... " msg = "Checking for $${label}... "
log($$msg) log($$msg)
$$QMAKE_CONFIG_VERBOSE: log("$$escape_expand(\\n)") $$QMAKE_CONFIG_VERBOSE: log("$$escape_expand(\\n)")
write_file($$QMAKE_CONFIG_LOG, msg, append) write_file($$QMAKE_CONFIG_LOG, msg, append)
} }
defineTest(qtLogTestResult) { defineTest(qtLogTestResult) {
isEmpty($${1}.description): return() isEmpty($${1}.label): return()
!isEmpty($${1}.log) { !isEmpty($${1}.log) {
field = $$eval($${1}.log) field = $$eval($${1}.log)
@ -1198,7 +1198,7 @@ defineReplace(qtConfCollectFeatures) {
l = l =
for (feature, $$list($${1})) { for (feature, $$list($${1})) {
$$eval($${currentConfig}.features.$${feature}.available): \ $$eval($${currentConfig}.features.$${feature}.available): \
l += $$eval($${currentConfig}.features.$${feature}.description) l += $$eval($${currentConfig}.features.$${feature}.label)
} }
isEmpty(l): return("<none>") isEmpty(l): return("<none>")
@ -1214,7 +1214,7 @@ defineReplace(qtConfFindFirstAvailableFeature) {
isEmpty($${currentConfig}.features.$${feature}._KEYS_): \ isEmpty($${currentConfig}.features.$${feature}._KEYS_): \
error("Asking for a report on undefined feature $${2}.") error("Asking for a report on undefined feature $${2}.")
$$eval($${currentConfig}.features.$${feature}.available): \ $$eval($${currentConfig}.features.$${feature}.available): \
return($$eval($${currentConfig}.features.$${feature}.description)) return($$eval($${currentConfig}.features.$${feature}.label))
} }
return("<none>") return("<none>")
@ -1240,7 +1240,7 @@ defineTest(qtConfReport_feature) {
!isEmpty(4): result = "$${4}" !isEmpty(4): result = "$${4}"
} }
text = $$eval($${currentConfig}.features.$${2}.description) text = $$eval($${currentConfig}.features.$${2}.label)
qtConfReportPadded($${1}$$text, $$result) qtConfReportPadded($${1}$$text, $$result)
} }

118
src/corelib/configure.json
View File

@ -21,21 +21,21 @@
"libraries": { "libraries": {
"doubleconversion": { "doubleconversion": {
"description": "DoubleConversion", "label": "DoubleConversion",
"test": "unix/doubleconversion", "test": "unix/doubleconversion",
"sources": [ "sources": [
"-ldouble-conversion" "-ldouble-conversion"
] ]
}, },
"glib": { "glib": {
"description": "GLib", "label": "GLib",
"test": "unix/glib", "test": "unix/glib",
"sources": [ "sources": [
{ "type": "pkgConfig", "args": "glib-2.0 gthread-2.0" } { "type": "pkgConfig", "args": "glib-2.0 gthread-2.0" }
] ]
}, },
"gnu_iconv": { "gnu_iconv": {
"description": "GNU libiconv", "label": "GNU libiconv",
"export": "iconv", "export": "iconv",
"test": "unix/gnu-libiconv", "test": "unix/gnu-libiconv",
"sources": [ "sources": [
@ -43,7 +43,7 @@
] ]
}, },
"icu": { "icu": {
"description": "ICU", "label": "ICU",
"export": "", "export": "",
"test": "unix/icu", "test": "unix/icu",
"sources": [ "sources": [
@ -59,7 +59,7 @@
] ]
}, },
"journald": { "journald": {
"description": "journald", "label": "journald",
"test": "unix/journald", "test": "unix/journald",
"export": "", "export": "",
"sources": [ "sources": [
@ -68,14 +68,14 @@
] ]
}, },
"libatomic": { "libatomic": {
"description": "64 bit atomics in libatomic", "label": "64 bit atomics in libatomic",
"test": "common/atomic64", "test": "common/atomic64",
"sources": [ "sources": [
"-latomic" "-latomic"
] ]
}, },
"libdl": { "libdl": {
"description": "dlopen() in libdl", "label": "dlopen() in libdl",
"export": "", "export": "",
"test": "unix/dlopen", "test": "unix/dlopen",
"sources": [ "sources": [
@ -83,21 +83,21 @@
] ]
}, },
"pcre": { "pcre": {
"description": "PCRE", "label": "PCRE",
"test": "unix/pcre", "test": "unix/pcre",
"sources": [ "sources": [
"-lpcre16" "-lpcre16"
] ]
}, },
"pps": { "pps": {
"description": "PPS", "label": "PPS",
"test": "unix/pps", "test": "unix/pps",
"sources": [ "sources": [
"-lpps" "-lpps"
] ]
}, },
"slog2": { "slog2": {
"description": "slog2", "label": "slog2",
"test": "unix/slog2", "test": "unix/slog2",
"export": "", "export": "",
"sources": [ "sources": [
@ -108,92 +108,92 @@
"tests": { "tests": {
"atomic64": { "atomic64": {
"description": "64 bit atomics", "label": "64 bit atomics",
"type": "compile", "type": "compile",
"test": "common/atomic64" "test": "common/atomic64"
}, },
"atomicfptr": { "atomicfptr": {
"description": "working std::atomic for function pointers", "label": "working std::atomic for function pointers",
"type": "compile", "type": "compile",
"test": "common/atomicfptr" "test": "common/atomicfptr"
}, },
"clock-gettime": { "clock-gettime": {
"description": "clock_gettime()", "label": "clock_gettime()",
"type": "compile", "type": "compile",
"test": "unix/clock-gettime" "test": "unix/clock-gettime"
}, },
"clock-monotonic": { "clock-monotonic": {
"description": "POSIX monotonic clock", "label": "POSIX monotonic clock",
"type": "compile", "type": "compile",
"test": "unix/clock-monotonic" "test": "unix/clock-monotonic"
}, },
"cloexec": { "cloexec": {
"description": "O_CLOEXEC", "label": "O_CLOEXEC",
"type": "compile", "type": "compile",
"test": "unix/cloexec" "test": "unix/cloexec"
}, },
"dlopen": { "dlopen": {
"description": "dlopen() in libc", "label": "dlopen() in libc",
"type": "compile", "type": "compile",
"test": "unix/dlopen" "test": "unix/dlopen"
}, },
"eventfd": { "eventfd": {
"description": "eventfd", "label": "eventfd",
"type": "compile", "type": "compile",
"test": "unix/eventfd" "test": "unix/eventfd"
}, },
"posix-iconv": { "posix-iconv": {
"description": "POSIX iconv", "label": "POSIX iconv",
"type": "compile", "type": "compile",
"test": "unix/iconv" "test": "unix/iconv"
}, },
"sun-iconv": { "sun-iconv": {
"description": "SUN libiconv", "label": "SUN libiconv",
"type": "compile", "type": "compile",
"test": "unix/sun-libiconv" "test": "unix/sun-libiconv"
}, },
"inotify": { "inotify": {
"description": "inotify", "label": "inotify",
"type": "compile", "type": "compile",
"test": "unix/inotify" "test": "unix/inotify"
}, },
"ipc_sysv": { "ipc_sysv": {
"description": "SysV IPC", "label": "SysV IPC",
"type": "compile", "type": "compile",
"test": "unix/ipc_sysv" "test": "unix/ipc_sysv"
}, },
"ipc_posix": { "ipc_posix": {
"description": "POSIX IPC", "label": "POSIX IPC",
"type": "compile", "type": "compile",
"test": "unix/ipc_posix" "test": "unix/ipc_posix"
}, },
"journald": { "journald": {
"description": "journald", "label": "journald",
"type": "compile", "type": "compile",
"test": "unix/journald" "test": "unix/journald"
}, },
"ppoll": { "ppoll": {
"description": "ppoll()", "label": "ppoll()",
"type": "compile", "type": "compile",
"test": "unix/ppoll" "test": "unix/ppoll"
}, },
"pollts": { "pollts": {
"description": "pollts()", "label": "pollts()",
"type": "compile", "type": "compile",
"test": "unix/pollts" "test": "unix/pollts"
}, },
"poll": { "poll": {
"description": "poll()", "label": "poll()",
"type": "compile", "type": "compile",
"test": "unix/poll" "test": "unix/poll"
}, },
"syslog": { "syslog": {
"description": "syslog", "label": "syslog",
"type": "compile", "type": "compile",
"test": "unix/syslog" "test": "unix/syslog"
}, },
"xlocalescanprint": { "xlocalescanprint": {
"description": "xlocale.h (or equivalents)", "label": "xlocale.h (or equivalents)",
"type": "compile", "type": "compile",
"test": "common/xlocalescanprint" "test": "common/xlocalescanprint"
} }
@ -201,111 +201,111 @@
"features": { "features": {
"clock-gettime": { "clock-gettime": {
"description": "clock_gettime()", "label": "clock_gettime()",
"condition": "tests.clock-gettime", "condition": "tests.clock-gettime",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"clock-monotonic": { "clock-monotonic": {
"description": "POSIX monotonic clock", "label": "POSIX monotonic clock",
"condition": "features.clock-gettime && tests.clock-monotonic", "condition": "features.clock-gettime && tests.clock-monotonic",
"output": [ "feature" ] "output": [ "feature" ]
}, },
"dlopen": { "dlopen": {
"description": "dlopen()", "label": "dlopen()",
"condition": "tests.dlopen || libs.libdl", "condition": "tests.dlopen || libs.libdl",
"output": [ { "type": "define", "negative": true, "name": "QT_NO_DYNAMIC_LIBRARY" } ] "output": [ { "type": "define", "negative": true, "name": "QT_NO_DYNAMIC_LIBRARY" } ]
}, },
"libdl": { "libdl": {
"description": "dlopen() in libdl", "label": "dlopen() in libdl",
"condition": "!tests.dlopen && libs.libdl", "condition": "!tests.dlopen && libs.libdl",
"output": [ { "type": "privateConfig", "negative": true } ] "output": [ { "type": "privateConfig", "negative": true } ]
}, },
"doubleconversion": { "doubleconversion": {
"description": "DoubleConversion", "label": "DoubleConversion",
"output": [ "privateFeature", "feature" ] "output": [ "privateFeature", "feature" ]
}, },
"system-doubleconversion": { "system-doubleconversion": {
"description": " Using system DoubleConversion", "label": " Using system DoubleConversion",
"enable": "input.doubleconversion == 'system'", "enable": "input.doubleconversion == 'system'",
"disable": "input.doubleconversion == 'qt'", "disable": "input.doubleconversion == 'qt'",
"condition": "features.doubleconversion && libs.doubleconversion", "condition": "features.doubleconversion && libs.doubleconversion",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"eventfd": { "eventfd": {
"description": "eventfd", "label": "eventfd",
"condition": "tests.eventfd", "condition": "tests.eventfd",
"output": [ "feature" ] "output": [ "feature" ]
}, },
"glib": { "glib": {
"description": "GLib", "label": "GLib",
"autoDetect": "!config.win32", "autoDetect": "!config.win32",
"condition": "libs.glib", "condition": "libs.glib",
"output": [ "privateFeature", "feature" ] "output": [ "privateFeature", "feature" ]
}, },
"iconv": { "iconv": {
"description": "iconv", "label": "iconv",
"condition": "features.posix-libiconv || features.sun-libiconv || features.gnu-libiconv", "condition": "features.posix-libiconv || features.sun-libiconv || features.gnu-libiconv",
"output": [ "privateFeature", "feature" ] "output": [ "privateFeature", "feature" ]
}, },
"posix-libiconv": { "posix-libiconv": {
"description": "POSIX iconv", "label": "POSIX iconv",
"enable": "input.iconv == 'posix'", "enable": "input.iconv == 'posix'",
"disable": "input.iconv == 'sun' || input.iconv == 'gnu' || input.iconv == 'no'", "disable": "input.iconv == 'sun' || input.iconv == 'gnu' || input.iconv == 'no'",
"condition": "!config.win32 && !config.qnx && !config.android && !config.darwin && tests.posix-iconv" "condition": "!config.win32 && !config.qnx && !config.android && !config.darwin && tests.posix-iconv"
}, },
"sun-libiconv": { "sun-libiconv": {
"description": "SUN iconv", "label": "SUN iconv",
"enable": "input.iconv == 'sun'", "enable": "input.iconv == 'sun'",
"disable": "input.iconv == 'posix' || input.iconv == 'gnu' || input.iconv == 'no'", "disable": "input.iconv == 'posix' || input.iconv == 'gnu' || input.iconv == 'no'",
"condition": "!config.win32 && !config.qnx && !config.android && !config.darwin && !features.posix-libiconv && tests.sun-iconv", "condition": "!config.win32 && !config.qnx && !config.android && !config.darwin && !features.posix-libiconv && tests.sun-iconv",
"output": [ "privateFeature", "publicQtConfig" ] "output": [ "privateFeature", "publicQtConfig" ]
}, },
"gnu-libiconv": { "gnu-libiconv": {
"description": "GNU iconv", "label": "GNU iconv",
"enable": "input.iconv == 'gnu'", "enable": "input.iconv == 'gnu'",
"disable": "input.iconv == 'posix' || input.iconv == 'sun' || input.iconv == 'no'", "disable": "input.iconv == 'posix' || input.iconv == 'sun' || input.iconv == 'no'",
"condition": "!config.win32 && !config.qnx && !config.android && !config.darwin && !features.posix-libiconv && !features.sun-libiconv && libs.gnu_iconv", "condition": "!config.win32 && !config.qnx && !config.android && !config.darwin && !features.posix-libiconv && !features.sun-libiconv && libs.gnu_iconv",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"icu": { "icu": {
"description": "ICU", "label": "ICU",
"autoDetect": "!config.win32", "autoDetect": "!config.win32",
"condition": "libs.icu", "condition": "libs.icu",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"inotify": { "inotify": {
"description": "inotify", "label": "inotify",
"condition": "tests.inotify", "condition": "tests.inotify",
"output": [ "privateFeature", "feature" ] "output": [ "privateFeature", "feature" ]
}, },
"ipc_posix": { "ipc_posix": {
"description": "Using POSIX IPC", "label": "Using POSIX IPC",
"autoDetect": "!config.win32", "autoDetect": "!config.win32",
"condition": "!tests.ipc_sysv && tests.ipc_posix", "condition": "!tests.ipc_sysv && tests.ipc_posix",
"output": [ { "type": "define", "name": "QT_POSIX_IPC" } ] "output": [ { "type": "define", "name": "QT_POSIX_IPC" } ]
}, },
"journald": { "journald": {
"description": "journald", "label": "journald",
"autoDetect": false, "autoDetect": false,
"condition": "libs.journald", "condition": "libs.journald",
"output": [ "privateConfig" ] "output": [ "privateConfig" ]
}, },
"std-atomic64": { "std-atomic64": {
"description": "64 bit atomic operations", "label": "64 bit atomic operations",
"condition": "tests.atomic64 || libs.libatomic", "condition": "tests.atomic64 || libs.libatomic",
"output": [ { "type": "define", "negative": true, "name": "QT_NO_STD_ATOMIC64" } ] "output": [ { "type": "define", "negative": true, "name": "QT_NO_STD_ATOMIC64" } ]
}, },
"libatomic": { "libatomic": {
"description": "64 bit atomic operations in libatomic", "label": "64 bit atomic operations in libatomic",
"condition": "!tests.atomic64 && libs.libatomic", "condition": "!tests.atomic64 && libs.libatomic",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"mimetype": { "mimetype": {
"description": "Mimetype handling", "label": "Mimetype handling",
"output": [ "publicFeature", "feature" ] "output": [ "publicFeature", "feature" ]
}, },
"system-pcre": { "system-pcre": {
"description": "Using system PCRE", "label": "Using system PCRE",
"disable": "input.pcre == 'qt'", "disable": "input.pcre == 'qt'",
"enable": "input.pcre == 'system'", "enable": "input.pcre == 'system'",
"condition": "libs.pcre", "condition": "libs.pcre",
@ -315,25 +315,25 @@
] ]
}, },
"poll_ppoll": { "poll_ppoll": {
"description": "Native ppoll()", "label": "Native ppoll()",
"emitIf": "!config.win32", "emitIf": "!config.win32",
"condition": "tests.ppoll", "condition": "tests.ppoll",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"poll_pollts": { "poll_pollts": {
"description": "Native pollts()", "label": "Native pollts()",
"emitIf": "!config.win32", "emitIf": "!config.win32",
"condition": "!features.poll_ppoll && tests.pollts", "condition": "!features.poll_ppoll && tests.pollts",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"poll_poll": { "poll_poll": {
"description": "Native poll()", "label": "Native poll()",
"emitIf": "!config.win32", "emitIf": "!config.win32",
"condition": "!features.poll_ppoll && !features.poll_pollts && tests.poll", "condition": "!features.poll_ppoll && !features.poll_pollts && tests.poll",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"poll_select": { "poll_select": {
"description": "Emulated poll()", "label": "Emulated poll()",
"emitIf": "!config.win32", "emitIf": "!config.win32",
"condition": "!features.poll_ppoll && !features.poll_pollts && !features.poll_poll", "condition": "!features.poll_ppoll && !features.poll_pollts && !features.poll_poll",
"output": [ "output": [
@ -342,39 +342,39 @@
] ]
}, },
"qqnx_pps": { "qqnx_pps": {
"description": "PPS", "label": "PPS",
"emitIf": "config.qnx", "emitIf": "config.qnx",
"condition": "libs.pps", "condition": "libs.pps",
"output": [ "privateConfig" ] "output": [ "privateConfig" ]
}, },
"qeventtransition": { "qeventtransition": {
"description": "QEventTransition class", "label": "QEventTransition class",
"output": [ "publicFeature" ] "output": [ "publicFeature" ]
}, },
"sharedmemory": { "sharedmemory": {
"description": "Enable QSharedMemory", "label": "Enable QSharedMemory",
"condition": "config.android || config.win32 || tests.ipc_sysv || tests.ipc_posix", "condition": "config.android || config.win32 || tests.ipc_sysv || tests.ipc_posix",
"output": [ { "type": "define", "negative": true, "name": "QT_NO_SHAREDMEMORY" } ] "output": [ { "type": "define", "negative": true, "name": "QT_NO_SHAREDMEMORY" } ]
}, },
"slog2": { "slog2": {
"description": "slog2", "label": "slog2",
"condition": "libs.slog2", "condition": "libs.slog2",
"emitIf": "config.qnx", "emitIf": "config.qnx",
"output": [ "privateConfig" ] "output": [ "privateConfig" ]
}, },
"syslog": { "syslog": {
"description": "syslog", "label": "syslog",
"autoDetect": false, "autoDetect": false,
"condition": "tests.syslog", "condition": "tests.syslog",
"output": [ "privateConfig" ] "output": [ "privateConfig" ]
}, },
"systemsemaphore": { "systemsemaphore": {
"description": "Enable QSystemSemaphore", "label": "Enable QSystemSemaphore",
"condition": "config.android || config.win32 || tests.ipc_sysv || tests.ipc_posix", "condition": "config.android || config.win32 || tests.ipc_sysv || tests.ipc_posix",
"output": [ { "type": "define", "negative": true, "name": "QT_NO_SYSTEMSEMAPHORE" } ] "output": [ { "type": "define", "negative": true, "name": "QT_NO_SYSTEMSEMAPHORE" } ]
}, },
"threadsafe-cloexec": { "threadsafe-cloexec": {
"description": "Threadsafe pipe creation", "label": "Threadsafe pipe creation",
"condition": "tests.cloexec", "condition": "tests.cloexec",
"output": [ "output": [
"publicQtConfig", "publicQtConfig",

212
src/gui/configure.json
View File

@ -55,14 +55,14 @@
] ]
}, },
"directfb": { "directfb": {
"description": "DirectFB", "label": "DirectFB",
"test": "qpa/directfb", "test": "qpa/directfb",
"sources": [ "sources": [
{ "type": "pkgConfig", "args": "directfb" } { "type": "pkgConfig", "args": "directfb" }
] ]
}, },
"directwrite": { "directwrite": {
"description": "DirectWrite", "label": "DirectWrite",
"export": "", "export": "",
"test": "win/directwrite", "test": "win/directwrite",
"sources": [ "sources": [
@ -70,7 +70,7 @@
] ]
}, },
"drm": { "drm": {
"description": "KMS", "label": "KMS",
"test": "qpa/kms", "test": "qpa/kms",
"sources": [ "sources": [
{ "type": "pkgConfig", "args": "libdrm" }, { "type": "pkgConfig", "args": "libdrm" },
@ -78,7 +78,7 @@
] ]
}, },
"egl": { "egl": {
"description": "EGL", "label": "EGL",
"test": "qpa/egl", "test": "qpa/egl",
"sources": [ "sources": [
{ "type": "pkgConfig", "args": "egl" }, { "type": "pkgConfig", "args": "egl" },
@ -86,7 +86,7 @@
] ]
}, },
"freetype": { "freetype": {
"description": "FreeType", "label": "FreeType",
"export": "", "export": "",
"test": "unix/freetype", "test": "unix/freetype",
"sources": [ "sources": [
@ -94,7 +94,7 @@
] ]
}, },
"fontconfig": { "fontconfig": {
"description": "Fontconfig", "label": "Fontconfig",
"test": "unix/fontconfig", "test": "unix/fontconfig",
"sources": [ "sources": [
{ "type": "pkgConfig", "args": "fontconfig freetype2" }, { "type": "pkgConfig", "args": "fontconfig freetype2" },
@ -102,21 +102,21 @@
] ]
}, },
"gbm": { "gbm": {
"description": "GBM", "label": "GBM",
"test": "qpa/gbm", "test": "qpa/gbm",
"sources": [ "sources": [
{ "type": "pkgConfig", "args": "gbm" } { "type": "pkgConfig", "args": "gbm" }
] ]
}, },
"harfbuzz": { "harfbuzz": {
"description": "HarfBuzz", "label": "HarfBuzz",
"test": "unix/harfbuzz", "test": "unix/harfbuzz",
"sources": [ "sources": [
"-lharfbuzz" "-lharfbuzz"
] ]
}, },
"imf": { "imf": {
"description": "IMF", "label": "IMF",
"export": "", "export": "",
"test": "unix/qqnx_imf", "test": "unix/qqnx_imf",
"sources": [ "sources": [
@ -124,21 +124,21 @@
] ]
}, },
"lgmon": { "lgmon": {
"description": "lgmon", "label": "lgmon",
"test": "unix/lgmon", "test": "unix/lgmon",
"sources": [ "sources": [
"-llgmon" "-llgmon"
] ]
}, },
"libinput": { "libinput": {
"description": "libinput", "label": "libinput",
"test": "unix/libinput", "test": "unix/libinput",
"sources": [ "sources": [
{ "type": "pkgConfig", "args": "libinput" } { "type": "pkgConfig", "args": "libinput" }
] ]
}, },
"libjpeg": { "libjpeg": {
"description": "libjpeg", "label": "libjpeg",
"test": "unix/libjpeg", "test": "unix/libjpeg",
"sources": [ "sources": [
{ "libs": "-llibjpeg", "condition": "config.msvc" }, { "libs": "-llibjpeg", "condition": "config.msvc" },
@ -146,7 +146,7 @@
] ]
}, },
"libpng": { "libpng": {
"description": "libpng", "label": "libpng",
"test": "unix/libpng", "test": "unix/libpng",
"sources": [ "sources": [
{ "type": "pkgConfig", "args": "libpng" }, { "type": "pkgConfig", "args": "libpng" },
@ -155,7 +155,7 @@
] ]
}, },
"mirclient": { "mirclient": {
"description": "Mir client libraries", "label": "Mir client libraries",
"export": "", "export": "",
"test": "qpa/mirclient", "test": "qpa/mirclient",
"sources": [ "sources": [
@ -163,7 +163,7 @@
] ]
}, },
"mtdev": { "mtdev": {
"description": "mtdev", "label": "mtdev",
"export": "", "export": "",
"test": "unix/mtdev", "test": "unix/mtdev",
"sources": [ "sources": [
@ -171,7 +171,7 @@
] ]
}, },
"opengl": { "opengl": {
"description": "Desktop OpenGL", "label": "Desktop OpenGL",
"test": "unix/opengldesktop", "test": "unix/opengldesktop",
"sources": [ "sources": [
{ "type": "pkgConfig", "args": "gl" }, { "type": "pkgConfig", "args": "gl" },
@ -179,7 +179,7 @@
] ]
}, },
"opengl_es2": { "opengl_es2": {
"description": "OpenGL ES 2.0", "label": "OpenGL ES 2.0",
"test": "unix/opengles2", "test": "unix/opengles2",
"sources": [ "sources": [
{ "type": "pkgConfig", "args": "glesv2" }, { "type": "pkgConfig", "args": "glesv2" },
@ -187,14 +187,14 @@
] ]
}, },
"tslib": { "tslib": {
"description": "tslib", "label": "tslib",
"test": "unix/tslib", "test": "unix/tslib",
"sources": [ "sources": [
"-lts" "-lts"
] ]
}, },
"wayland_server": { "wayland_server": {
"description": "Wayland Server", "label": "Wayland Server",
"export": "", "export": "",
"test": "qpa/wayland-server", "test": "qpa/wayland-server",
"sources": [ "sources": [
@ -202,13 +202,13 @@
] ]
}, },
"x11sm": { "x11sm": {
"description": "X11 session management", "label": "X11 session management",
"sources": [ "sources": [
{ "type": "pkgConfig", "args": "sm ice" } { "type": "pkgConfig", "args": "sm ice" }
] ]
}, },
"xcb": { "xcb": {
"description": "XCB >= 1.5 (core)", "label": "XCB >= 1.5 (core)",
"test": "qpa/xcb", "test": "qpa/xcb",
"sources": [ "sources": [
{ "type": "pkgConfig", "args": "xcb >= 1.5" }, { "type": "pkgConfig", "args": "xcb >= 1.5" },
@ -216,7 +216,7 @@
] ]
}, },
"xcb_syslibs": { "xcb_syslibs": {
"description": "XCB (secondary)", "label": "XCB (secondary)",
"test": "qpa/xcb-syslibs", "test": "qpa/xcb-syslibs",
"sources": [ "sources": [
{ "type": "pkgConfig", { "type": "pkgConfig",
@ -225,7 +225,7 @@
] ]
}, },
"xcb_xlib": { "xcb_xlib": {
"description": "XCB Xlib", "label": "XCB Xlib",
"test": "qpa/xcb-xlib", "test": "qpa/xcb-xlib",
"sources": [ "sources": [
{ "type": "pkgConfig", "args": "X11-xcb x11 xcb" }, { "type": "pkgConfig", "args": "X11-xcb x11 xcb" },
@ -233,7 +233,7 @@
] ]
}, },
"xcb_xkb": { "xcb_xkb": {
"description": "XCB XKB >= 1.10", "label": "XCB XKB >= 1.10",
"test": "qpa/xcb-xkb", "test": "qpa/xcb-xkb",
"sources": [ "sources": [
{ "type": "pkgConfig", "args": "xcb-xkb >= 1.10 xcb" }, { "type": "pkgConfig", "args": "xcb-xkb >= 1.10 xcb" },
@ -241,7 +241,7 @@
] ]
}, },
"xcb_render": { "xcb_render": {
"description": "XCB XRender", "label": "XCB XRender",
"test": "qpa/xcb-render", "test": "qpa/xcb-render",
"sources": [ "sources": [
{ "type": "pkgConfig", "args": "xcb-renderutil xcb-render xcb" }, { "type": "pkgConfig", "args": "xcb-renderutil xcb-render xcb" },
@ -249,7 +249,7 @@
] ]
}, },
"xcb_glx": { "xcb_glx": {
"description": "XCB GLX", "label": "XCB GLX",
"test": "qpa/xcb-glx", "test": "qpa/xcb-glx",
"sources": [ "sources": [
{ "type": "pkgConfig", "args": "xcb-glx xcb" }, { "type": "pkgConfig", "args": "xcb-glx xcb" },
@ -257,7 +257,7 @@
] ]
}, },
"xinput2": { "xinput2": {
"description": "Xinput2", "label": "Xinput2",
"test": "x11/xinput2", "test": "x11/xinput2",
"sources": [ "sources": [
{ "type": "pkgConfig", "args": "xi" }, { "type": "pkgConfig", "args": "xi" },
@ -265,7 +265,7 @@
] ]
}, },
"xkbcommon": { "xkbcommon": {
"description": "xkbcommon", "label": "xkbcommon",
"export": "xkbcommon_evdev", "export": "xkbcommon_evdev",
"test": "unix/xkbcommon", "test": "unix/xkbcommon",
"sources": [ "sources": [
@ -273,14 +273,14 @@
] ]
}, },
"xkbcommon_x11": { "xkbcommon_x11": {
"description": "xkbcommon-x11 >= 0.4.1", "label": "xkbcommon-x11 >= 0.4.1",
"export": "xkbcommon", "export": "xkbcommon",
"sources": [ "sources": [
{ "type": "pkgConfig", "args": "xkbcommon xkbcommon-x11 >= 0.4.1" } { "type": "pkgConfig", "args": "xkbcommon xkbcommon-x11 >= 0.4.1" }
] ]
}, },
"xrender": { "xrender": {
"description": "XRender", "label": "XRender",
"test": "x11/xrender", "test": "x11/xrender",
"sources": [ "sources": [
"-lXrender" "-lXrender"
@ -295,19 +295,19 @@
"tests": { "tests": {
"direct2d": { "direct2d": {
"description": "Direct 2D", "label": "Direct 2D",
"type": "compile", "type": "compile",
"test": "qpa/direct2d", "test": "qpa/direct2d",
"use": "direct2d" "use": "direct2d"
}, },
"directwrite2": { "directwrite2": {
"description": "DirectWrite 2", "label": "DirectWrite 2",
"type": "compile", "type": "compile",
"test": "win/directwrite2", "test": "win/directwrite2",
"use": "directwrite" "use": "directwrite"
}, },
"directx": { "directx": {
"description": "DirectX SDK", "label": "DirectX SDK",
"type": "directX", "type": "directX",
"files": [ "files": [
"d3dcompiler.h", "d3dcompiler.h",
@ -316,70 +316,70 @@
] ]
}, },
"egl-x11": { "egl-x11": {
"description": "EGL on X11", "label": "EGL on X11",
"type": "compile", "type": "compile",
"test": "qpa/egl-x11", "test": "qpa/egl-x11",
"use": "egl xcb_xlib" "use": "egl xcb_xlib"
}, },
"egl-brcm": { "egl-brcm": {
"description": "Broadcom EGL (Rasberry Pi)", "label": "Broadcom EGL (Rasberry Pi)",
"type": "compile", "type": "compile",
"test": "qpa/eglfs-brcm", "test": "qpa/eglfs-brcm",
"use": "egl bcm_host" "use": "egl bcm_host"
}, },
"egl-egldevice": { "egl-egldevice": {
"description": "EGLDevice", "label": "EGLDevice",
"type": "compile", "type": "compile",
"test": "qpa/eglfs-egldevice", "test": "qpa/eglfs-egldevice",
"use": "egl" "use": "egl"
}, },
"egl-mali": { "egl-mali": {
"description": "Mali EGL", "label": "Mali EGL",
"type": "compile", "type": "compile",
"test": "qpa/eglfs-mali", "test": "qpa/eglfs-mali",
"use": "egl" "use": "egl"
}, },
"egl-mali-2": { "egl-mali-2": {
"description": "Mali 2 EGL", "label": "Mali 2 EGL",
"type": "compile", "type": "compile",
"test": "qpa/eglfs-mali-2", "test": "qpa/eglfs-mali-2",
"use": "egl" "use": "egl"
}, },
"egl-viv": { "egl-viv": {
"description": "i.Mx6 EGL", "label": "i.Mx6 EGL",
"type": "compile", "type": "compile",
"test": "qpa/eglfs-viv", "test": "qpa/eglfs-viv",
"use": "egl" "use": "egl"
}, },
"evdev": { "evdev": {
"description": "evdev", "label": "evdev",
"type": "compile", "type": "compile",
"test": "unix/evdev" "test": "unix/evdev"
}, },
"linuxfb": { "linuxfb": {
"description": "LinuxFB", "label": "LinuxFB",
"type": "compile", "type": "compile",
"test": "qpa/linuxfb" "test": "qpa/linuxfb"
}, },
"opengles3": { "opengles3": {
"description": "OpenGL ES 3.0", "label": "OpenGL ES 3.0",
"type": "compile", "type": "compile",
"test": "unix/opengles3", "test": "unix/opengles3",
"use": "opengl_es2" "use": "opengl_es2"
}, },
"opengles31": { "opengles31": {
"description": "OpenGL ES 3.1", "label": "OpenGL ES 3.1",
"type": "compile", "type": "compile",
"test": "unix/opengles31", "test": "unix/opengles31",
"use": "opengl_es2" "use": "opengl_es2"
}, },
"qpa_default_platform": { "qpa_default_platform": {
"description": "default QPA platform", "label": "default QPA platform",
"type": "qpaDefaultPlatform", "type": "qpaDefaultPlatform",
"log": "value" "log": "value"
}, },
"x11prefix": { "x11prefix": {
"description": "X11 prefix", "label": "X11 prefix",
"type": "getPkgConfigVariable", "type": "getPkgConfigVariable",
"pkg-config-args": "x11", "pkg-config-args": "x11",
"pkg-config-variable": "prefix", "pkg-config-variable": "prefix",
@ -387,14 +387,14 @@
"log": "value" "log": "value"
}, },
"xkbconfigroot": { "xkbconfigroot": {
"description": "XKB config root", "label": "XKB config root",
"type": "xkbConfigRoot", "type": "xkbConfigRoot",
"pkg-config-args": "xkeyboard-config", "pkg-config-args": "xkeyboard-config",
"pkg-config-variable": "xkb_base", "pkg-config-variable": "xkb_base",
"log": "value" "log": "value"
}, },
"xlib": { "xlib": {
"description": "XLib", "label": "XLib",
"type": "compile", "type": "compile",
"test": "x11/xlib" "test": "x11/xlib"
} }
@ -402,12 +402,12 @@
"features": { "features": {
"accessibility-atspi-bridge": { "accessibility-atspi-bridge": {
"description": "ATSPI Bridge", "label": "ATSPI Bridge",
"condition": "features.accessibility && features.xcb && features.dbus", "condition": "features.accessibility && features.xcb && features.dbus",
"output": [ "privateFeature", "feature" ] "output": [ "privateFeature", "feature" ]
}, },
"angle": { "angle": {
"description": "ANGLE", "label": "ANGLE",
"autoDetect": "features.opengles2 || features.opengl-dynamic", "autoDetect": "features.opengles2 || features.opengl-dynamic",
"condition": "config.win32 && tests.directx", "condition": "config.win32 && tests.directx",
"output": [ "output": [
@ -416,40 +416,40 @@
] ]
}, },
"directfb": { "directfb": {
"description": "DirectFB", "label": "DirectFB",
"autoDetect": false, "autoDetect": false,
"condition": "libs.directfb", "condition": "libs.directfb",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"directwrite": { "directwrite": {
"description": "DirectWrite", "label": "DirectWrite",
"emitIf": "config.win32", "emitIf": "config.win32",
"condition": "libs.directwrite", "condition": "libs.directwrite",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"directwrite2": { "directwrite2": {
"description": "DirectWrite 2", "label": "DirectWrite 2",
"emitIf": "config.win32", "emitIf": "config.win32",
"condition": "features.directwrite && tests.directwrite2", "condition": "features.directwrite && tests.directwrite2",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"direct2d": { "direct2d": {
"description": "Direct 2D", "label": "Direct 2D",
"autoDetect": false, "autoDetect": false,
"condition": "tests.direct2d", "condition": "tests.direct2d",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"evdev": { "evdev": {
"description": "evdev", "label": "evdev",
"condition": "tests.evdev", "condition": "tests.evdev",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"freetype": { "freetype": {
"description": "FreeType", "label": "FreeType",
"output": [ "privateFeature", "feature" ] "output": [ "privateFeature", "feature" ]
}, },
"system-freetype": { "system-freetype": {
"description": " Using system FreeType", "label": " Using system FreeType",
"enable": "input.freetype == 'system'", "enable": "input.freetype == 'system'",
"disable": "input.freetype == 'qt'", "disable": "input.freetype == 'qt'",
"autoDetect": "!config.win32", "autoDetect": "!config.win32",
@ -457,21 +457,21 @@
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"fontconfig": { "fontconfig": {
"description": "Fontconfig", "label": "Fontconfig",
"condition": "!config.win32 && !config.darwin && features.system-freetype && libs.fontconfig", "condition": "!config.win32 && !config.darwin && features.system-freetype && libs.fontconfig",
"output": [ "privateFeature", "feature" ] "output": [ "privateFeature", "feature" ]
}, },
"gbm": { "gbm": {
"description": "GBM", "label": "GBM",
"condition": "libs.gbm", "condition": "libs.gbm",
"output": [ "publicQtConfig" ] "output": [ "publicQtConfig" ]
}, },
"harfbuzz": { "harfbuzz": {
"description": "HarfBuzz", "label": "HarfBuzz",
"output": [ "privateFeature", "feature" ] "output": [ "privateFeature", "feature" ]
}, },
"system-harfbuzz": { "system-harfbuzz": {
"description": " Using system HarfBuzz", "label": " Using system HarfBuzz",
"enable": "input.harfbuzz == 'system'", "enable": "input.harfbuzz == 'system'",
"disable": "input.harfbuzz == 'qt'", "disable": "input.harfbuzz == 'qt'",
"autoDetect": "!config.darwin && !config.win32", "autoDetect": "!config.darwin && !config.win32",
@ -479,49 +479,49 @@
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"qqnx_imf": { "qqnx_imf": {
"description": "IMF", "label": "IMF",
"emitIf": "config.qnx", "emitIf": "config.qnx",
"condition": "libs.imf", "condition": "libs.imf",
"output": [ "privateConfig" ] "output": [ "privateConfig" ]
}, },
"integrityfb": { "integrityfb": {
"description": "INTEGRITY framebuffer", "label": "INTEGRITY framebuffer",
"condition": "config.integrity", "condition": "config.integrity",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"kms": { "kms": {
"description": "KMS", "label": "KMS",
"condition": "libs.drm", "condition": "libs.drm",
"output": [ "publicQtConfig" ] "output": [ "publicQtConfig" ]
}, },
"libinput": { "libinput": {
"description": "libinput", "label": "libinput",
"condition": "features.libudev && libs.libinput", "condition": "features.libudev && libs.libinput",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"lgmon": { "lgmon": {
"description": "lgmon", "label": "lgmon",
"emitIf": "config.qnx", "emitIf": "config.qnx",
"condition": "libs.lgmon", "condition": "libs.lgmon",
"output": [ "privateConfig" ] "output": [ "privateConfig" ]
}, },
"linuxfb": { "linuxfb": {
"description": "LinuxFB", "label": "LinuxFB",
"condition": "tests.linuxfb", "condition": "tests.linuxfb",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"mirclient": { "mirclient": {
"description": "Mir client", "label": "Mir client",
"condition": "libs.mirclient", "condition": "libs.mirclient",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"mtdev": { "mtdev": {
"description": "mtdev", "label": "mtdev",
"condition": "libs.mtdev", "condition": "libs.mtdev",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"opengles2": { "opengles2": {
"description": "OpenGL ES 2.0", "label": "OpenGL ES 2.0",
"enable": "input.opengl == 'es2'", "enable": "input.opengl == 'es2'",
"disable": "input.opengl == 'desktop' || input.opengl == 'dynamic' || input.opengl == 'no'", "disable": "input.opengl == 'desktop' || input.opengl == 'dynamic' || input.opengl == 'no'",
"condition": "config.win32 || (!config.watchos && !features.opengl-desktop && libs.opengl_es2)", "condition": "config.win32 || (!config.watchos && !features.opengl-desktop && libs.opengl_es2)",
@ -533,7 +533,7 @@
] ]
}, },
"opengles3": { "opengles3": {
"description": "OpenGL ES 3.0", "label": "OpenGL ES 3.0",
"condition": "features.opengles2 && !features.angle && tests.opengles3", "condition": "features.opengles2 && !features.angle && tests.opengles3",
"output": [ "output": [
"publicFeature", "publicFeature",
@ -541,7 +541,7 @@
] ]
}, },
"opengles31": { "opengles31": {
"description": "OpenGL ES 3.1", "label": "OpenGL ES 3.1",
"condition": "features.opengles3 && tests.opengles31", "condition": "features.opengles3 && tests.opengles31",
"output": [ "output": [
"publicFeature", "publicFeature",
@ -549,14 +549,14 @@
] ]
}, },
"opengl-desktop": { "opengl-desktop": {
"description": "Desktop OpenGL", "label": "Desktop OpenGL",
"enable": "input.opengl == 'desktop'", "enable": "input.opengl == 'desktop'",
"disable": "input.opengl == 'es2' || input.opengl == 'dynamic' || input.opengl == 'no'", "disable": "input.opengl == 'es2' || input.opengl == 'dynamic' || input.opengl == 'no'",
"condition": "(config.win32 && !config.winrt && !features.opengles2 && (config.msvc || libs.opengl)) "condition": "(config.win32 && !config.winrt && !features.opengles2 && (config.msvc || libs.opengl))
|| (!config.watchos && !config.win32 && libs.opengl)" || (!config.watchos && !config.win32 && libs.opengl)"
}, },
"opengl-dynamic": { "opengl-dynamic": {
"description": "Dynamic OpenGL", "label": "Dynamic OpenGL",
"enable": "input.opengl == 'dynamic'", "enable": "input.opengl == 'dynamic'",
"autoDetect": false, "autoDetect": false,
"condition": "config.win32 && !config.winrt", "condition": "config.win32 && !config.winrt",
@ -566,69 +566,69 @@
] ]
}, },
"opengl": { "opengl": {
"description": "OpenGL", "label": "OpenGL",
"condition": "features.opengl-desktop || features.opengl-dynamic || features.opengles2", "condition": "features.opengl-desktop || features.opengl-dynamic || features.opengles2",
"output": [ "publicFeature", "feature" ] "output": [ "publicFeature", "feature" ]
}, },
"egl": { "egl": {
"description": "EGL", "label": "EGL",
"condition": "features.opengl && (features.angle || libs.egl)", "condition": "features.opengl && (features.angle || libs.egl)",
"output": [ "privateFeature", "feature" ] "output": [ "privateFeature", "feature" ]
}, },
"egl_x11": { "egl_x11": {
"description": "EGL on X11", "label": "EGL on X11",
"condition": "features.egl && tests.egl-x11", "condition": "features.egl && tests.egl-x11",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"eglfs": { "eglfs": {
"description": "EGLFS", "label": "EGLFS",
"autoDetect": "!config.android && !config.win32", "autoDetect": "!config.android && !config.win32",
"condition": "features.egl", "condition": "features.egl",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"eglfs_brcm": { "eglfs_brcm": {
"description": "EGLFS Rasberry Pi", "label": "EGLFS Rasberry Pi",
"condition": "features.eglfs && tests.egl-brcm", "condition": "features.eglfs && tests.egl-brcm",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"eglfs_egldevice": { "eglfs_egldevice": {
"description": "EGLFS EGLDevice", "label": "EGLFS EGLDevice",
"condition": "features.eglfs && tests.egl-egldevice && features.kms", "condition": "features.eglfs && tests.egl-egldevice && features.kms",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"eglfs_gbm": { "eglfs_gbm": {
"description": "EGLFS GBM", "label": "EGLFS GBM",
"condition": "features.eglfs && features.gbm && features.kms", "condition": "features.eglfs && features.gbm && features.kms",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"eglfs_mali": { "eglfs_mali": {
"description": "EGLFS Mali", "label": "EGLFS Mali",
"condition": "features.eglfs && (tests.egl-mali || tests.egl-mali-2)", "condition": "features.eglfs && (tests.egl-mali || tests.egl-mali-2)",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"eglfs_viv": { "eglfs_viv": {
"description": "EGLFS i.Mx6", "label": "EGLFS i.Mx6",
"condition": "features.eglfs && tests.egl-viv", "condition": "features.eglfs && tests.egl-viv",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"eglfs_viv_wl": { "eglfs_viv_wl": {
"description": "EGLFS i.Mx6 Wayland", "label": "EGLFS i.Mx6 Wayland",
"condition": "features.eglfs_viv && libs.wayland_server", "condition": "features.eglfs_viv && libs.wayland_server",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"gif": { "gif": {
"description": "GIF", "label": "GIF",
"output": [ "output": [
"privateFeature", "privateFeature",
{ "type": "define", "negative": true, "name": "QT_NO_IMAGEFORMAT_GIF" } { "type": "define", "negative": true, "name": "QT_NO_IMAGEFORMAT_GIF" }
] ]
}, },
"ico": { "ico": {
"description": "ICO", "label": "ICO",
"output": [ "privateFeature", "feature" ] "output": [ "privateFeature", "feature" ]
}, },
"jpeg": { "jpeg": {
"description": "JPEG", "label": "JPEG",
"disable": "input.libjpeg == 'no'", "disable": "input.libjpeg == 'no'",
"output": [ "output": [
"privateFeature", "privateFeature",
@ -636,14 +636,14 @@
] ]
}, },
"system-jpeg": { "system-jpeg": {
"description": " Using system libjpeg", "label": " Using system libjpeg",
"disable": "input.libjpeg == 'qt'", "disable": "input.libjpeg == 'qt'",
"enable": "input.libjpeg == 'system'", "enable": "input.libjpeg == 'system'",
"condition": "features.jpeg && libs.libjpeg", "condition": "features.jpeg && libs.libjpeg",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"png": { "png": {
"description": "PNG", "label": "PNG",
"disable": "input.libpng == 'no'", "disable": "input.libpng == 'no'",
"output": [ "output": [
"privateFeature", "privateFeature",
@ -651,14 +651,14 @@
] ]
}, },
"system-png": { "system-png": {
"description": " Using system libpng", "label": " Using system libpng",
"disable": "input.libpng == 'qt'", "disable": "input.libpng == 'qt'",
"enable": "input.libpng == 'system'", "enable": "input.libpng == 'system'",
"condition": "features.png && libs.libpng", "condition": "features.png && libs.libpng",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"qpa_default_platform": { "qpa_default_platform": {
"description": "QPA default platform", "label": "QPA default platform",
"condition": "features.gui", "condition": "features.gui",
"output": [ "output": [
{ "type": "define", "name": "QT_QPA_DEFAULT_PLATFORM_NAME", "value": "tests.qpa_default_platform.name" }, { "type": "define", "name": "QT_QPA_DEFAULT_PLATFORM_NAME", "value": "tests.qpa_default_platform.name" },
@ -667,22 +667,22 @@
] ]
}, },
"sessionmanager": { "sessionmanager": {
"description": "Session Management", "label": "Session Management",
"output": [ "feature" ] "output": [ "feature" ]
}, },
"tslib": { "tslib": {
"description": "tslib", "label": "tslib",
"condition": "libs.tslib", "condition": "libs.tslib",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"xcb": { "xcb": {
"description": "XCB", "label": "XCB",
"autoDetect": "!config.darwin", "autoDetect": "!config.darwin",
"condition": "libs.xcb", "condition": "libs.xcb",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"system-xcb": { "system-xcb": {
"description": "Using system provided XCB libraries", "label": "Using system provided XCB libraries",
"enable": "input.xcb == 'system' || input.xcb == 'yes'", "enable": "input.xcb == 'system' || input.xcb == 'yes'",
"disable": "input.xcb == 'qt' || input.xcb == 'no'", "disable": "input.xcb == 'qt' || input.xcb == 'no'",
"autoDetect": "!config.darwin", "autoDetect": "!config.darwin",
@ -690,46 +690,46 @@
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"x11-prefix": { "x11-prefix": {
"description": "X11 prefix", "label": "X11 prefix",
"emitIf": "features.xcb", "emitIf": "features.xcb",
"output": [ { "type": "varAssign", "name": "QMAKE_X11_PREFIX", "value": "tests.x11prefix.value" } ] "output": [ { "type": "varAssign", "name": "QMAKE_X11_PREFIX", "value": "tests.x11prefix.value" } ]
}, },
"xcb-glx": { "xcb-glx": {
"description": "XCB GLX", "label": "XCB GLX",
"emitIf": "features.xcb", "emitIf": "features.xcb",
"condition": "libs.xcb_glx", "condition": "libs.xcb_glx",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"xcb-render": { "xcb-render": {
"description": "XCB render", "label": "XCB render",
"emitIf": "features.system-xcb", "emitIf": "features.system-xcb",
"condition": "libs.xcb_render", "condition": "libs.xcb_render",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"xcb-xlib": { "xcb-xlib": {
"description": "XCB Xlib", "label": "XCB Xlib",
"emitIf": "features.xcb", "emitIf": "features.xcb",
"condition": "libs.xcb_xlib", "condition": "libs.xcb_xlib",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"xcb-sm": { "xcb-sm": {
"description": "xcb-sm", "label": "xcb-sm",
"emitIf": "features.xcb", "emitIf": "features.xcb",
"condition": "features.sessionmanager && libs.x11sm", "condition": "features.sessionmanager && libs.x11sm",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"xinput2": { "xinput2": {
"description": "Xinput2", "label": "Xinput2",
"condition": "libs.xinput2", "condition": "libs.xinput2",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"xkbcommon-evdev": { "xkbcommon-evdev": {
"description": "xkbcommon-evdev", "label": "xkbcommon-evdev",
"condition": "libs.xkbcommon", "condition": "libs.xkbcommon",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"xkbcommon-system": { "xkbcommon-system": {
"description": "Using system-provided xkbcommon", "label": "Using system-provided xkbcommon",
"emitIf": "features.xcb", "emitIf": "features.xcb",
"enable": "input.xkbcommon == 'system'", "enable": "input.xkbcommon == 'system'",
"disable": "input.xkbcommon == 'qt' || input.xkbcommon == 'no'", "disable": "input.xkbcommon == 'qt' || input.xkbcommon == 'no'",
@ -737,23 +737,23 @@
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"xkb": { "xkb": {
"description": "XCB XKB", "label": "XCB XKB",
"condition": "features.system-xcb && libs.xcb_xkb", "condition": "features.system-xcb && libs.xcb_xkb",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"xkb-config-root": { "xkb-config-root": {
"description": "XKB config root", "label": "XKB config root",
"emitIf": "features.xcb", "emitIf": "features.xcb",
"condition": "features.xcb && !features.xkbcommon-system && tests.xkbconfigroot", "condition": "features.xcb && !features.xkbcommon-system && tests.xkbconfigroot",
"output": [ { "type": "varAssign", "name": "QMAKE_XKB_CONFIG_ROOT", "value": "tests.xkbconfigroot.value"} ] "output": [ { "type": "varAssign", "name": "QMAKE_XKB_CONFIG_ROOT", "value": "tests.xkbconfigroot.value"} ]
}, },
"xlib": { "xlib": {
"description": "XLib", "label": "XLib",
"condition": "tests.xlib", "condition": "tests.xlib",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"xrender": { "xrender": {
"description": "Xrender", "label": "Xrender",
"condition": "libs.xrender", "condition": "libs.xrender",
"output": [ "privateFeature", "feature" ] "output": [ "privateFeature", "feature" ]
} }

38
src/network/configure.json
View File

@ -26,7 +26,7 @@
"libraries": { "libraries": {
"corewlan": { "corewlan": {
"description": "CoreWLan", "label": "CoreWLan",
"export": "", "export": "",
"test": "mac/corewlan", "test": "mac/corewlan",
"sources": [ "sources": [
@ -40,14 +40,14 @@
] ]
}, },
"libproxy": { "libproxy": {
"description": "libproxy", "label": "libproxy",
"test": "common/libproxy", "test": "common/libproxy",
"sources": [ "sources": [
"-lproxy" "-lproxy"
] ]
}, },
"openssl": { "openssl": {
"description": "OpenSSL Libraries", "label": "OpenSSL Libraries",
"export": "", "export": "",
"sources": [ "sources": [
{ "type": "openssl" }, { "type": "openssl" },
@ -68,30 +68,30 @@
"tests": { "tests": {
"getaddrinfo": { "getaddrinfo": {
"description": "getaddrinfo()", "label": "getaddrinfo()",
"type": "compile", "type": "compile",
"test": "unix/getaddrinfo", "test": "unix/getaddrinfo",
"use": "network" "use": "network"
}, },
"getifaddrs": { "getifaddrs": {
"description": "getifaddrs()", "label": "getifaddrs()",
"type": "compile", "type": "compile",
"test": "unix/getifaddrs", "test": "unix/getifaddrs",
"use": "network" "use": "network"
}, },
"ipv6ifname": { "ipv6ifname": {
"description": "IPv6 ifname", "label": "IPv6 ifname",
"type": "compile", "type": "compile",
"test": "unix/ipv6ifname", "test": "unix/ipv6ifname",
"use": "network" "use": "network"
}, },
"openssl": { "openssl": {
"description": "OpenSSL", "label": "OpenSSL",
"type": "compile", "type": "compile",
"test": "unix/openssl" "test": "unix/openssl"
}, },
"sctp": { "sctp": {
"description": "SCTP support", "label": "SCTP support",
"type": "compile", "type": "compile",
"test": "unix/sctp", "test": "unix/sctp",
"use": "network" "use": "network"
@ -100,34 +100,34 @@
"features": { "features": {
"corewlan": { "corewlan": {
"description": "CoreWLan", "label": "CoreWLan",
"condition": "libs.corewlan", "condition": "libs.corewlan",
"emitIf": "config.darwin", "emitIf": "config.darwin",
"output": [ "feature", "privateFeature" ] "output": [ "feature", "privateFeature" ]
}, },
"getaddrinfo": { "getaddrinfo": {
"description": "getaddrinfo()", "label": "getaddrinfo()",
"condition": "tests.getaddrinfo", "condition": "tests.getaddrinfo",
"output": [ "feature" ] "output": [ "feature" ]
}, },
"getifaddrs": { "getifaddrs": {
"description": "getifaddrs()", "label": "getifaddrs()",
"condition": "tests.getifaddrs", "condition": "tests.getifaddrs",
"output": [ "feature" ] "output": [ "feature" ]
}, },
"ipv6ifname": { "ipv6ifname": {
"description": "IPv6 ifname", "label": "IPv6 ifname",
"condition": "tests.ipv6ifname", "condition": "tests.ipv6ifname",
"output": [ "feature" ] "output": [ "feature" ]
}, },
"libproxy": { "libproxy": {
"description": "libproxy", "label": "libproxy",
"autoDetect": false, "autoDetect": false,
"condition": "libs.libproxy", "condition": "libs.libproxy",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"openssl": { "openssl": {
"description": "OpenSSL", "label": "OpenSSL",
"enable": "input.openssl == 'yes' || input.openssl == 'linked' || input.openssl == 'runtime'", "enable": "input.openssl == 'yes' || input.openssl == 'linked' || input.openssl == 'runtime'",
"disable": "input.openssl == 'no' || input.ssl == 'no'", "disable": "input.openssl == 'no' || input.ssl == 'no'",
"autoDetect": "!config.winrt", "autoDetect": "!config.winrt",
@ -139,7 +139,7 @@
] ]
}, },
"openssl-linked": { "openssl-linked": {
"description": " Qt directly linked to OpenSSL", "label": " Qt directly linked to OpenSSL",
"enable": "input.openssl == 'linked'", "enable": "input.openssl == 'linked'",
"disable": "input.openssl != 'linked'", "disable": "input.openssl != 'linked'",
"condition": "features.openssl && libs.openssl", "condition": "features.openssl && libs.openssl",
@ -154,7 +154,7 @@
] ]
}, },
"securetransport": { "securetransport": {
"description": "SecureTransport", "label": "SecureTransport",
"disable": "input.securetransport == 'no' || input.ssl == 'no'", "disable": "input.securetransport == 'no' || input.ssl == 'no'",
"condition": "config.darwin && (input.openssl == '' || input.openssl == 'no')", "condition": "config.darwin && (input.openssl == '' || input.openssl == 'no')",
"output": [ "output": [
@ -163,18 +163,18 @@
] ]
}, },
"ssl": { "ssl": {
"description": "SSL", "label": "SSL",
"condition": "config.winrt || features.securetransport || features.openssl", "condition": "config.winrt || features.securetransport || features.openssl",
"output": [ "publicFeature", "feature" ] "output": [ "publicFeature", "feature" ]
}, },
"sctp": { "sctp": {
"description": "SCTP", "label": "SCTP",
"autoDetect": false, "autoDetect": false,
"condition": "tests.sctp", "condition": "tests.sctp",
"output": [ "publicFeature", "feature" ] "output": [ "publicFeature", "feature" ]
}, },
"system-proxies": { "system-proxies": {
"description": "Use system proxies", "label": "Use system proxies",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
} }
}, },

4
src/printsupport/configure.json
View File

@ -15,7 +15,7 @@
"libraries": { "libraries": {
"cups": { "cups": {
"description": "CUPS", "label": "CUPS",
"test": "unix/cups", "test": "unix/cups",
"sources": [ "sources": [
"-lcups" "-lcups"
@ -25,7 +25,7 @@
"features": { "features": {
"cups": { "cups": {
"description": "CUPS", "label": "CUPS",
"condition": "libs.cups", "condition": "libs.cups",
"output": [ "privateFeature", "feature" ] "output": [ "privateFeature", "feature" ]
} }

40
src/sql/configure.json
View File

@ -39,7 +39,7 @@
"libraries": { "libraries": {
"db2": { "db2": {
"description": "DB2 (IBM)", "label": "DB2 (IBM)",
"test": "unix/db2", "test": "unix/db2",
"sources": [ "sources": [
{ "libs": "-ldb2cli", "condition": "config.win32" }, { "libs": "-ldb2cli", "condition": "config.win32" },
@ -47,7 +47,7 @@
] ]
}, },
"ibase": { "ibase": {
"description": "InterBase", "label": "InterBase",
"test": "unix/ibase", "test": "unix/ibase",
"sources": [ "sources": [
{ "libs": "-lgds32_ms", "condition": "config.win32" }, { "libs": "-lgds32_ms", "condition": "config.win32" },
@ -55,7 +55,7 @@
] ]
}, },
"mysql": { "mysql": {
"description": "MySQL", "label": "MySQL",
"test": "unix/mysql", "test": "unix/mysql",
"sources": [ "sources": [
{ "type": "mysqlConfig", "query": "--libs_r" }, { "type": "mysqlConfig", "query": "--libs_r" },
@ -66,7 +66,7 @@
] ]
}, },
"psql": { "psql": {
"description": "PostgreSQL", "label": "PostgreSQL",
"test": "unix/psql", "test": "unix/psql",
"sources": [ "sources": [
{ "type": "psqlConfig" }, { "type": "psqlConfig" },
@ -75,7 +75,7 @@
] ]
}, },
"tds": { "tds": {
"description": "TDS (Sybase)", "label": "TDS (Sybase)",
"test": "unix/tds", "test": "unix/tds",
"sources": [ "sources": [
{ "type": "sybaseEnv", "libs": "-lNTWDBLIB", "condition": "config.win32" }, { "type": "sybaseEnv", "libs": "-lNTWDBLIB", "condition": "config.win32" },
@ -83,7 +83,7 @@
] ]
}, },
"oci": { "oci": {
"description": "OCI (Oracle)", "label": "OCI (Oracle)",
"test": "unix/oci", "test": "unix/oci",
"sources": [ "sources": [
{ "libs": "-loci", "condition": "config.win32" }, { "libs": "-loci", "condition": "config.win32" },
@ -91,7 +91,7 @@
] ]
}, },
"odbc": { "odbc": {
"description": "ODBC", "label": "ODBC",
"test": "unix/odbc", "test": "unix/odbc",
"sources": [ "sources": [
{ "libs": "-lodbc32", "condition": "config.win32" }, { "libs": "-lodbc32", "condition": "config.win32" },
@ -100,14 +100,14 @@
] ]
}, },
"sqlite2": { "sqlite2": {
"description": "SQLite (version 2)", "label": "SQLite (version 2)",
"test": "unix/sqlite2", "test": "unix/sqlite2",
"sources": [ "sources": [
"-lsqlite" "-lsqlite"
] ]
}, },
"sqlite3": { "sqlite3": {
"description": "SQLite (version 3)", "label": "SQLite (version 3)",
"export": "sqlite", "export": "sqlite",
"test": "unix/sqlite", "test": "unix/sqlite",
"sources": [ "sources": [
@ -123,57 +123,57 @@
"features": { "features": {
"sql-db2": { "sql-db2": {
"description": "DB2 (IBM)", "label": "DB2 (IBM)",
"condition": "libs.db2", "condition": "libs.db2",
"output": [ "publicFeature" ] "output": [ "publicFeature" ]
}, },
"sql-ibase": { "sql-ibase": {
"description": "InterBase", "label": "InterBase",
"condition": "libs.ibase", "condition": "libs.ibase",
"output": [ "publicFeature" ] "output": [ "publicFeature" ]
}, },
"sql-mysql": { "sql-mysql": {
"description": "MySql", "label": "MySql",
"condition": "libs.mysql", "condition": "libs.mysql",
"output": [ "publicFeature" ] "output": [ "publicFeature" ]
}, },
"use_libmysqlclient_r": { "use_libmysqlclient_r": {
"description": "MySql (threadsafe)", "label": "MySql (threadsafe)",
"condition": "features.sql-mysql && (libs.mysql.source == 0 || libs.mysql.source == 2)", "condition": "features.sql-mysql && (libs.mysql.source == 0 || libs.mysql.source == 2)",
"output": [ "privateConfig" ] "output": [ "privateConfig" ]
}, },
"sql-oci": { "sql-oci": {
"description": "OCI (Oracle)", "label": "OCI (Oracle)",
"condition": "libs.oci", "condition": "libs.oci",
"output": [ "publicFeature" ] "output": [ "publicFeature" ]
}, },
"sql-odbc": { "sql-odbc": {
"description": "ODBC", "label": "ODBC",
"condition": "libs.odbc", "condition": "libs.odbc",
"output": [ "publicFeature" ] "output": [ "publicFeature" ]
}, },
"sql-psql": { "sql-psql": {
"description": "PostgreSQL", "label": "PostgreSQL",
"condition": "libs.psql", "condition": "libs.psql",
"output": [ "publicFeature" ] "output": [ "publicFeature" ]
}, },
"sql-sqlite2": { "sql-sqlite2": {
"description": "SQLite2", "label": "SQLite2",
"condition": "libs.sqlite2", "condition": "libs.sqlite2",
"output": [ "publicFeature" ] "output": [ "publicFeature" ]
}, },
"sql-sqlite": { "sql-sqlite": {
"description": "SQLite", "label": "SQLite",
"output": [ "publicFeature" ] "output": [ "publicFeature" ]
}, },
"system-sqlite": { "system-sqlite": {
"description": " Using system provided SQLite", "label": " Using system provided SQLite",
"autoDetect": false, "autoDetect": false,
"condition": "features.sql-sqlite && libs.sqlite3", "condition": "features.sql-sqlite && libs.sqlite3",
"output": [ "publicQtConfig" ] "output": [ "publicQtConfig" ]
}, },
"sql-tds": { "sql-tds": {
"description": "TDS (Sybase)", "label": "TDS (Sybase)",
"condition": "libs.tds", "condition": "libs.tds",
"output": [ "publicFeature" ] "output": [ "publicFeature" ]
} }

20
src/widgets/configure.json
View File

@ -21,7 +21,7 @@
"libraries": { "libraries": {
"gtk3": { "gtk3": {
"description": "GTK+", "label": "GTK+",
"sources": [ "sources": [
{ "type": "pkgConfig", "args": "gtk+-3.0" } { "type": "pkgConfig", "args": "gtk+-3.0" }
] ]
@ -30,7 +30,7 @@
"tests": { "tests": {
"uxtheme": { "uxtheme": {
"description": "uxtheme.h", "label": "uxtheme.h",
"type": "files", "type": "files",
"files": [ "uxtheme.h" ] "files": [ "uxtheme.h" ]
} }
@ -38,41 +38,41 @@
"features": { "features": {
"gtk3": { "gtk3": {
"description": "GTK+", "label": "GTK+",
"autoDetect": "!config.darwin", "autoDetect": "!config.darwin",
"condition": "features.glib && libs.gtk3", "condition": "features.glib && libs.gtk3",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"style-fusion": { "style-fusion": {
"description": "Fusion Style", "label": "Fusion Style",
"output": [ "styles" ] "output": [ "styles" ]
}, },
"style-mac": { "style-mac": {
"description": "Mac Style", "label": "Mac Style",
"condition": "config.osx", "condition": "config.osx",
"output": [ "styles" ] "output": [ "styles" ]
}, },
"style-windows": { "style-windows": {
"description": "Windows Style", "label": "Windows Style",
"output": [ "styles" ] "output": [ "styles" ]
}, },
"style-windowsxp": { "style-windowsxp": {
"description": "Windows XP Style", "label": "Windows XP Style",
"condition": "features.style-windows && config.win32 && !config.winrt && tests.uxtheme", "condition": "features.style-windows && config.win32 && !config.winrt && tests.uxtheme",
"output": [ "styles" ] "output": [ "styles" ]
}, },
"style-windowsvista": { "style-windowsvista": {
"description": "Windows Vista Style", "label": "Windows Vista Style",
"condition": "features.style-windowsxp", "condition": "features.style-windowsxp",
"output": [ "styles" ] "output": [ "styles" ]
}, },
"style-android": { "style-android": {
"description": "Android Style", "label": "Android Style",
"autoDetect": "config.android", "autoDetect": "config.android",
"output": [ "styles" ] "output": [ "styles" ]
}, },
"android-style-assets": { "android-style-assets": {
"description": "Android Style Assets", "label": "Android Style Assets",
"condition": "features.style-android", "condition": "features.style-android",
"output": [ "privateConfig" ] "output": [ "privateConfig" ]
} }