rename description => label in configure.json

"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>

9 files changed, 362 insertions, 362 deletions

diff --git a/configure.json b/configure.json
index 2c37957914..f26187f633 100644
--- a/configure.json
+++ b/configure.json
@@ -149,7 +149,7 @@
 
     "libraries": {
         "zlib": {
-            "description": "zlib",
+            "label": "zlib",
             "test": "unix/zlib",
             "sources": [
                 { "libs": "-lzdll", "condition": "config.msvc" },
@@ -157,7 +157,7 @@
             ]
         },
         "alsa": {
-            "description": "ALSA",
+            "label": "ALSA",
             "export": "",
             "test": "unix/alsa",
             "sources": [
@@ -165,14 +165,14 @@
             ]
         },
         "pulseaudio": {
-            "description": "PulseAudio >= 0.9.10",
+            "label": "PulseAudio >= 0.9.10",
             "test": "unix/pulseaudio",
             "sources": [
                 { "type": "pkgConfig", "args": "libpulse >= 0.9.10 libpulse-mainloop-glib" }
             ]
         },
         "gstreamer_1_0": {
-            "description": "GStreamer 1.0",
+            "label": "GStreamer 1.0",
             "export": "",
             "test": "unix/gstreamer",
             "sources": [
@@ -181,7 +181,7 @@
             ]
         },
         "gstreamer_0_10": {
-            "description": "GStreamer 0.10",
+            "label": "GStreamer 0.10",
             "export": "",
             "test": "unix/gstreamer",
             "sources": [
@@ -190,7 +190,7 @@
             ]
         },
         "dbus": {
-            "description": "D-Bus >= 1.2",
+            "label": "D-Bus >= 1.2",
             "test": "unix/dbus",
             "sources": [
                 { "type": "pkgConfig", "args": "dbus-1 >= 1.2" },
@@ -206,7 +206,7 @@
             ]
         },
         "host_dbus": {
-            "description": "D-Bus >= 1.2 (host)",
+            "label": "D-Bus >= 1.2 (host)",
             "export": "",
             "sources": [
                 { "type": "pkgConfig", "host": true, "args": "dbus-1 >= 1.2" },
@@ -214,7 +214,7 @@
             ]
         },
         "libudev": {
-            "description": "udev",
+            "label": "udev",
             "test": "unix/libudev",
             "sources": [
                 { "type": "pkgConfig", "args": "libudev" },
@@ -239,18 +239,18 @@
 
     "tests": {
         "verifyspec": {
-            "description": "valid makespec",
+            "label": "valid makespec",
             "type": "verifySpec",
             "test": "common/verifyspec"
         },
         "architecture": {
-            "description": "target architecture",
+            "label": "target architecture",
             "type": "architecture",
             "test": "arch",
             "log": "arch"
         },
         "host_architecture": {
-            "description": "host architecture",
+            "label": "host architecture",
             "type": "architecture",
             "test": "arch",
             "host": true,
@@ -258,60 +258,60 @@
             "log": "arch"
         },
         "GNUmake": {
-            "description": "GNU make",
+            "label": "GNU make",
             "type": "gnumake"
         },
         "pkg-config": {
-            "description": "pkg-config",
+            "label": "pkg-config",
             "type": "detectPkgConfig"
         },
         "stl": {
-            "description": "STL compatibility",
+            "label": "STL compatibility",
             "type": "compile",
             "test": "unix/stl"
         },
         "c++14": {
-            "description": "C++14 support",
+            "label": "C++14 support",
             "type": "compile",
             "test": "common/c++14"
         },
         "c++1z": {
-            "description": "C++1z support",
+            "label": "C++1z support",
             "type": "compile",
             "test": "common/c++1z"
         },
         "cxx98default": {
-            "description": "compiler defaulting to C++98",
+            "label": "compiler defaulting to C++98",
             "type": "compile",
             "test": "common/c++98default"
         },
         "compiler": {
-            "description": "Compiler",
+            "label": "Compiler",
             "type": "checkCompiler",
             "log": "compilerDescription"
         },
         "precompile_header": {
-            "description": "precompiled header support",
+            "label": "precompiled header support",
             "type": "compile",
             "test": "common/pch"
         },
         "use_gold_linker": {
-            "description": "gold linker",
+            "label": "gold linker",
             "type": "compilerSupportsFlag",
             "flag": "-fuse-ld=gold"
         },
         "enable_new_dtags": {
-            "description": "new dtags support",
+            "label": "new dtags support",
             "type": "linkerSupportsFlag",
             "flag": "--enable-new-dtags"
         },
         "reduce_exports": {
-            "description": "symbol visibility support",
+            "label": "symbol visibility support",
             "type": "compile",
             "test": "unix/reduce_exports"
         },
         "reduce_relocations": {
-            "description": "-Bsymbolic-functions support",
+            "label": "-Bsymbolic-functions support",
             "type": "compile",
             "test": "unix/reduce_relocs"
         },
@@ -319,140 +319,140 @@
             "type": "buildParts"
         },
         "separate_debug_info": {
-            "description": "separate debug information support",
+            "label": "separate debug information support",
             "type": "compile",
             "test": "unix/objcopy"
         },
         "sse2": {
-            "description": "SSE2 instructions",
+            "label": "SSE2 instructions",
             "type": "compile",
             "test": "common/sse2"
         },
         "sse3": {
-            "description": "SSE3 instructions",
+            "label": "SSE3 instructions",
             "type": "compile",
             "test": "common/sse3"
         },
         "ssse3": {
-            "description": "SSSE3 instructions",
+            "label": "SSSE3 instructions",
             "type": "compile",
             "test": "common/ssse3"
         },
         "sse4_1": {
-            "description": "SSE4.1 instructions",
+            "label": "SSE4.1 instructions",
             "type": "compile",
             "test": "common/sse4_1"
         },
         "sse4_2": {
-            "description": "SSE4.2 instructions",
+            "label": "SSE4.2 instructions",
             "type": "compile",
             "test": "common/sse4_2"
         },
         "avx": {
-            "description": "AVX instructions",
+            "label": "AVX instructions",
             "type": "compile",
             "test": "common/avx"
         },
         "avx_apple_clang": {
-            "description": "bugfree AVX support in compiler",
+            "label": "bugfree AVX support in compiler",
             "type": "avx_test_apple_clang"
         },
         "avx2": {
-            "description": "AVX2 instructions",
+            "label": "AVX2 instructions",
             "type": "compile",
             "test": "common/avx2"
         },
         "avx512f": {
-            "description": "AVX512 F instructions",
+            "label": "AVX512 F instructions",
             "type": "compile",
             "test": "common/avx512",
             "args": "AVX512=F"
         },
         "avx512er": {
-            "description": "AVX512 ER instructions",
+            "label": "AVX512 ER instructions",
             "type": "compile",
             "test": "common/avx512",
             "args": "AVX512=ER"
         },
         "avx512cd": {
-            "description": "AVX512 CD instructions",
+            "label": "AVX512 CD instructions",
             "type": "compile",
             "test": "common/avx512",
             "args": "AVX512=CD"
         },
         "avx512pf": {
-            "description": "AVX512 PF instructions",
+            "label": "AVX512 PF instructions",
             "type": "compile",
             "test": "common/avx512",
             "args": "AVX512=PF"
         },
         "avx512dq": {
-            "description": "AVX512 DQ instructions",
+            "label": "AVX512 DQ instructions",
             "type": "compile",
             "test": "common/avx512",
             "args": "AVX512=DQ"
         },
         "avx512bw": {
-            "description": "AVX512 BW instructions",
+            "label": "AVX512 BW instructions",
             "type": "compile",
             "test": "common/avx512",
             "args": "AVX512=BW"
         },
         "avx512vl": {
-            "description": "AVX512 VL instructions",
+            "label": "AVX512 VL instructions",
             "type": "compile",
             "test": "common/avx512",
             "args": "AVX512=VL"
         },
         "avx512ifma": {
-            "description": "AVX512 IFMA instructions",
+            "label": "AVX512 IFMA instructions",
             "type": "compile",
             "test": "common/avx512",
             "args": "AVX512=IFMA"
         },
         "avx512vbmi": {
-            "description": "AVX512 VBMI instructions",
+            "label": "AVX512 VBMI instructions",
             "type": "compile",
             "test": "common/avx512",
             "args": "AVX512=VBMI"
         },
         "mips_dsp": {
-            "description": "MIPS DSP instructions",
+            "label": "MIPS DSP instructions",
             "type": "compile",
             "test": "unix/mips_dsp"
         },
         "mips_dspr2": {
-            "description": "MIPS DSPr2 instructions",
+            "label": "MIPS DSPr2 instructions",
             "type": "compile",
             "test": "common/mips_dspr2"
         },
         "neon": {
-            "description": "NEON instructions",
+            "label": "NEON instructions",
             "type": "neon"
         },
 
         "mremap": {
-            "description": "mremap()",
+            "label": "mremap()",
             "type": "compile",
             "test": "unix/mremap"
         },
         "posix_fallocate": {
-            "description": "POSIX fallocate()",
+            "label": "POSIX fallocate()",
             "type": "compile",
             "test": "unix/posix_fallocate"
         },
         "stack_protector": {
-            "description": "stack protection",
+            "label": "stack protection",
             "type": "compilerSupportsFlag",
             "test": "-fstack-protector-strong"
         },
         "incredibuild_xge": {
-            "description": "IncrediBuild",
+            "label": "IncrediBuild",
             "type": "files",
             "files": [ "BuildConsole.exe", "xgConsole.exe" ]
         },
         "wmf": {
-            "description": "WMF",
+            "label": "WMF",
             "type": "files",
             "files": [ "mfapi.h", "mf.lib" ]
         }
@@ -460,7 +460,7 @@
 
     "features": {
         "shared": {
-            "description": "Building shared libraries",
+            "label": "Building shared libraries",
             "condition": "!config.uikit && !config.integrity",
             "output": [
                 "shared",
@@ -478,12 +478,12 @@
             ]
         },
         "cross_compile": {
-            "description": "Cross compiling",
+            "label": "Cross compiling",
             "condition": "call.crossCompile",
             "output": [ "publicConfig", "privateConfig" ]
         },
         "cxx98default": {
-            "description": "Compiler defaults to C++98",
+            "label": "Compiler defaults to C++98",
             "condition": "tests.cxx98default",
             "output": [ { "type": "publicConfig", "name": "c++11" } ]
         },
@@ -499,16 +499,16 @@
             "condition": "input.qmakeArgs != ''"
         },
         "use_gold_linker": {
-            "description": "Using gold linker",
+            "label": "Using gold linker",
             "condition": "!config.msvc && tests.use_gold_linker",
             "output": [ "privateConfig", "useGoldLinker" ]
         },
         "architecture": {
-            "description": "Architecture",
+            "label": "Architecture",
             "output": [ "architecture" ]
         },
         "pkg-config": {
-            "description": "Using pkg-config",
+            "label": "Using pkg-config",
             "autoDetect": "!config.darwin && !config.win32",
             "condition": "tests.pkg-config",
             "output": [
@@ -518,11 +518,11 @@
             ]
         },
         "verifyspec": {
-            "description": "Have valid makespec",
+            "label": "Have valid makespec",
             "condition": "tests.verifyspec"
         },
         "developer-build": {
-            "description": "Developer build",
+            "label": "Developer build",
             "autoDetect": false,
             "output": [
                 { "type": "define", "name": "QT_BUILD_INTERNAL" },
@@ -531,22 +531,22 @@
             ]
         },
         "debug": {
-            "description": "Build for debugging",
+            "label": "Build for debugging",
             "autoDetect": "features.developer-build || config.win32 || config.darwin"
         },
         "debug_and_release": {
-            "description": "Compile libs in debug and release mode",
+            "label": "Compile libs in debug and release mode",
             "autoDetect": "input.debug == ''",
             "condition": "config.darwin || config.win32",
             "output": [ "publicFeature", "publicQtConfig", "debugAndRelease" ]
         },
         "force_debug_info": {
-            "description": "Add debug info in release mode",
+            "label": "Add debug info in release mode",
             "autoDetect": false,
             "output": [ "privateConfig" ]
         },
         "separate_debug_info": {
-            "description": "Split off debug information",
+            "label": "Split off debug information",
             "autoDetect": false,
             "condition": [
                 "features.shared",
@@ -556,11 +556,11 @@
             "output": [ "publicFeature", "publicQtConfig" ]
         },
         "release_tools": {
-            "description": "Compile tools in release mode",
+            "label": "Compile tools in release mode",
             "output": [ "privateFeature", "publicQtConfig" ]
         },
         "simulator_and_device": {
-            "description": "Build for both simulator and device",
+            "label": "Build for both simulator and device",
             "condition": "config.uikit && input.sdk == ''",
             "output": [ "publicFeature", "publicQtConfig" ]
         },
@@ -569,39 +569,39 @@
             "output": [ "publicFeature", "publicQtConfig" ]
         },
         "rpath": {
-            "description": "Build with RPATH",
+            "label": "Build with RPATH",
             "autoDetect": "var.QMAKE_LFLAGS_RPATH != '' && features.shared",
             "output": [ "publicFeature", "publicQtConfig" ]
         },
         "rpath_dir": {
-            "description": "RPATH directory",
+            "label": "RPATH directory",
             "enable": "input.rpaths != ''",
             "autoDetect": false,
             "output": [ { "type": "varAppend", "name": "EXTRA_RPATHS", "value": "input.rpaths" } ]
         },
         "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.",
             "condition": "config.win32",
             "output": [ "publicConfig" ]
         },
         "force_asserts": {
-            "description": "Force assertions",
+            "label": "Force assertions",
             "autoDetect": false,
             "output": [ "publicFeature" ]
         },
         "warnings_are_errors": {
-            "description": "WError",
+            "label": "WError",
             "autoDetect": "features.developer-build",
             "output": [ "privateConfig" ]
         },
         "headersclean": {
-            "description": "Check for clean headers",
+            "label": "Check for clean headers",
             "autoDetect": "features.developer-build",
             "output": [ "privateConfig" ]
         },
         "framework": {
-            "description": "Build Apple Frameworks",
+            "label": "Build Apple Frameworks",
             "condition": "config.darwin && features.shared",
             "output": [
                 { "type": "define", "name": "QT_MAC_FRAMEWORK_BUILD" },
@@ -611,7 +611,7 @@
             ]
         },
         "largefile": {
-            "description": "Large file support",
+            "label": "Large file support",
             "condition": "!config.android && !config.integrity && !config.winrt",
             "output": [
                 "privateConfig",
@@ -619,59 +619,59 @@
             ]
         },
         "testcocoon": {
-            "description": "Testcocoon support",
+            "label": "Testcocoon support",
             "autoDetect": false,
             "output": [ "publicConfig" ]
         },
         "gcov": {
-            "description": "gcov support",
+            "label": "gcov support",
             "autoDetect": false,
             "output": [ "publicConfig" ]
         },
         "silent": {
-            "description": "Silent build",
+            "label": "Silent build",
             "autoDetect": false,
             "output": [ "privateConfig" ]
         },
         "sanitize_address": {
-            "description": "Addresses",
+            "label": "Addresses",
             "autoDetect": false,
             "output": [ "publicConfig" ]
         },
         "sanitize_thread": {
-            "description": "Threads",
+            "label": "Threads",
             "autoDetect": false,
             "output": [ "publicConfig" ]
         },
         "sanitize_memory": {
-            "description": "Memory",
+            "label": "Memory",
             "autoDetect": false,
             "output": [ "publicConfig" ]
         },
         "sanitize_undefined": {
-            "description": "Undefined",
+            "label": "Undefined",
             "autoDetect": false,
             "output": [ "publicConfig" ]
         },
         "sanitizer": {
-            "description": "Sanitizers",
+            "label": "Sanitizers",
             "condition": "features.sanitize_address || features.sanitize_thread || features.sanitize_memory || features.sanitize_undefined",
             "output": [ "publicConfig" ]
         },
         "GNUmake": {
-            "description": "GNU make",
+            "label": "GNU make",
             "autoDetect": false,
             "condition": "tests.GNUmake",
             "output": [ "privateConfig" ]
         },
         "plugin-manifests": {
-            "description": "Embed manifests in plugins",
+            "label": "Embed manifests in plugins",
             "emitIf": "config.win32",
             "autoDetect": false,
             "output": [ { "type": "publicConfig", "negative": true, "name": "no_plugin_manifest" } ]
         },
         "profile": {
-            "description": "GNU profiling support",
+            "label": "GNU profiling support",
             "autoDetect": false,
             "output": [
                 { "type": "varAppend", "name": "QMAKE_CFLAGS", "value": "'-pg'" },
@@ -680,36 +680,36 @@
             ]
         },
         "strip": {
-            "description": "Strip binaries",
+            "label": "Strip binaries",
             "condition": "!features.profile",
             "output": [ { "type": "privateConfig", "negative": true, "name": "nostrip" } ]
         },
         "stl": {
-            "description": "STL compatibility",
+            "label": "STL compatibility",
             "condition": "tests.stl",
             "output": [ "publicQtConfig" ]
         },
         "c++11": {
-            "description": "C++11",
+            "label": "C++11",
             "output": [ "publicFeature", "publicQtConfig" ]
         },
         "c++14": {
-            "description": "C++14",
+            "label": "C++14",
             "condition": "features.c++11 && tests.c++14",
             "output": [ "publicFeature", "publicQtConfig" ]
         },
         "c++1z": {
-            "description": "C++1z",
+            "label": "C++1z",
             "condition": "features.c++14 && tests.c++1z",
             "output": [ "publicFeature", "publicQtConfig" ]
         },
         "compiler": {
-            "description": "Compiler version",
+            "label": "Compiler version",
             "condition": "tests.compiler",
             "output": [ "compilerVersion" ]
         },
         "precompile_header": {
-            "description": "Using precompiled headers",
+            "label": "Using precompiled headers",
             "condition": "config.msvc || tests.precompile_header",
             "output": [
                 "privateConfig",
@@ -717,17 +717,17 @@
             ]
         },
         "ltcg": {
-            "description": "Using LTCG",
+            "label": "Using LTCG",
             "autoDetect": false,
             "output": [ "privateConfig" ]
         },
         "enable_new_dtags": {
-            "description": "Using new DTAGS",
+            "label": "Using new DTAGS",
             "condition": "config.linux && tests.enable_new_dtags",
             "output": [ "privateConfig" ]
         },
         "reduce_exports": {
-            "description": "Reduce amount of exported symbols",
+            "label": "Reduce amount of exported symbols",
             "condition": "!config.win32 && tests.reduce_exports",
             "output": [
                 "privateFeature",
@@ -736,7 +736,7 @@
             ]
         },
         "reduce_relocations": {
-            "description": "Reduce amount of relocations",
+            "label": "Reduce amount of relocations",
             "condition": "!config.win32 && tests.reduce_relocations",
             "output": [
                 "privateFeature",
@@ -745,7 +745,7 @@
             ]
         },
         "sse2": {
-            "description": "SSE2",
+            "label": "SSE2",
             "condition": "(arch.i386 || arch.x86_64) && tests.sse2",
             "output": [
                 "privateConfig",
@@ -754,7 +754,7 @@
             ]
         },
         "sse3": {
-            "description": "SSE3",
+            "label": "SSE3",
             "condition": "features.sse2 && tests.sse3",
             "output": [
                 "privateConfig",
@@ -762,7 +762,7 @@
             ]
         },
         "ssse3": {
-            "description": "SSSE3",
+            "label": "SSSE3",
             "condition": "features.sse3 && tests.ssse3",
             "output": [
                 "privateConfig",
@@ -770,7 +770,7 @@
             ]
         },
         "sse4_1": {
-            "description": "SSE4.1",
+            "label": "SSE4.1",
             "condition": "features.ssse3 && tests.sse4_1",
             "output": [
                 "privateConfig",
@@ -778,7 +778,7 @@
             ]
         },
         "sse4_2": {
-            "description": "SSE4.2",
+            "label": "SSE4.2",
             "condition": "features.sse4_1 && tests.sse4_2",
             "output": [
                 "privateConfig",
@@ -786,7 +786,7 @@
             ]
         },
         "avx": {
-            "description": "AVX",
+            "label": "AVX",
             "condition": "features.sse4_2 && tests.avx && tests.avx_apple_clang",
             "output": [
                 "privateConfig",
@@ -794,7 +794,7 @@
             ]
         },
         "avx2": {
-            "description": "AVX2",
+            "label": "AVX2",
             "condition": "features.avx && tests.avx2",
             "output": [
                 "privateConfig",
@@ -802,7 +802,7 @@
             ]
         },
         "avx512f": {
-            "description": "F",
+            "label": "F",
             "condition": "features.avx2 && tests.avx512f",
             "output": [
                 "privateConfig",
@@ -810,7 +810,7 @@
             ]
         },
         "avx512er": {
-            "description": "ER",
+            "label": "ER",
             "condition": "features.avx512f && tests.avx512er",
             "output": [
                 "privateConfig",
@@ -818,7 +818,7 @@
             ]
         },
         "avx512cd": {
-            "description": "CD",
+            "label": "CD",
             "condition": "features.avx512f && tests.avx512cd",
             "output": [
                 "privateConfig",
@@ -826,7 +826,7 @@
             ]
         },
         "avx512pf": {
-            "description": "PF",
+            "label": "PF",
             "condition": "features.avx512f && tests.avx512pf",
             "output": [
                 "privateConfig",
@@ -834,7 +834,7 @@
             ]
         },
         "avx512dq": {
-            "description": "DQ",
+            "label": "DQ",
             "condition": "features.avx512f && tests.avx512dq",
             "output": [
                 "privateConfig",
@@ -842,7 +842,7 @@
             ]
         },
         "avx512bw": {
-            "description": "BW",
+            "label": "BW",
             "condition": "features.avx512f && tests.avx512bw",
             "output": [
                 "privateConfig",
@@ -850,7 +850,7 @@
             ]
         },
         "avx512vl": {
-            "description": "VL",
+            "label": "VL",
             "condition": "features.avx512f && tests.avx512vl",
             "output": [
                 "privateConfig",
@@ -858,7 +858,7 @@
             ]
         },
         "avx512ifma": {
-            "description": "IFMA",
+            "label": "IFMA",
             "condition": "features.avx512f && tests.avx512ifma",
             "output": [
                 "privateConfig",
@@ -866,7 +866,7 @@
             ]
         },
         "avx512vbmi": {
-            "description": "VBMI",
+            "label": "VBMI",
             "condition": "features.avx512f && tests.avx512vbmi",
             "output": [
                 "privateConfig",
@@ -874,7 +874,7 @@
             ]
         },
         "mips_dsp": {
-            "description": "DSP",
+            "label": "DSP",
             "condition": "arch.mips && tests.mips_dsp",
             "output": [
                 "privateConfig",
@@ -882,7 +882,7 @@
             ]
         },
         "mips_dspr2": {
-            "description": "DSPr2",
+            "label": "DSPr2",
             "condition": "arch.mips && tests.mips_dspr2",
             "output": [
                 "privateConfig",
@@ -890,7 +890,7 @@
             ]
         },
         "neon": {
-            "description": "NEON",
+            "label": "NEON",
             "condition": "(arch.arm || arch.arm64) && tests.neon",
             "output": [
                 "privateConfig",
@@ -898,57 +898,57 @@
             ]
         },
         "alsa": {
-            "description": "ALSA",
+            "label": "ALSA",
             "condition": "libs.alsa",
             "output": [ "feature" ]
         },
         "mremap": {
-            "description": "mremap()",
+            "label": "mremap()",
             "condition": "tests.mremap",
             "output": [ "feature" ]
         },
         "posix_fallocate": {
-            "description": "POSIX fallocate()",
+            "label": "POSIX fallocate()",
             "condition": "tests.posix_fallocate",
             "output": [ "privateFeature" ]
         },
         "stack-protector-strong": {
-            "description": "stack protection",
+            "label": "stack protection",
             "condition": "config.qnx && tests.stack_protector",
             "output": [ "publicQtConfig" ]
         },
         "accessibility": {
-            "description": "Accessibility",
+            "label": "Accessibility",
             "output": [ "publicFeature", "feature" ]
         },
         "pulseaudio": {
-            "description": "PulseAudio",
+            "label": "PulseAudio",
             "condition": "libs.pulseaudio",
             "output": [ "feature" ]
         },
         "system-zlib": {
-            "description": "Using system zlib",
+            "label": "Using system zlib",
             "condition": "libs.zlib",
             "output": [ "privateFeature" ]
         },
         "concurrent": {
-            "description": "Qt Concurrent",
+            "label": "Qt Concurrent",
             "output": [ "publicFeature", "feature" ]
         },
         "dbus": {
-            "description": "Qt D-Bus",
+            "label": "Qt D-Bus",
             "autoDetect": "!config.uikit && !config.android && !config.winrt",
             "output": [ "privateFeature", "feature" ]
         },
         "dbus-linked": {
-            "description": "Qt D-Bus directly linked to libdbus",
+            "label": "Qt D-Bus directly linked to libdbus",
             "enable": "input.dbus == 'linked'",
             "disable": "input.dbus == 'runtime'",
             "condition": "features.dbus && libs.dbus",
             "output": [ "privateFeature" ]
         },
         "host-dbus": {
-            "description": "Qt D-Bus (Host)",
+            "label": "Qt D-Bus (Host)",
             "autoDetect": "!config.android",
             "condition": "libs.host_dbus",
             "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" } ]
         },
         "qreal": {
-            "description": "Type for qreal",
+            "label": "Type for qreal",
             "output": [ "qreal" ]
         },
         "gui": {
-            "description": "Qt Gui",
+            "label": "Qt Gui",
             "output": [
                 "privateFeature",
                 { "type": "publicQtConfig", "negative": true }
             ]
         },
         "widgets": {
-            "description": "Qt Widgets",
+            "label": "Qt Widgets",
             "condition": "features.gui",
             "output": [
                 "privateFeature",
@@ -977,57 +977,57 @@
             ]
         },
         "libudev": {
-            "description": "udev",
+            "label": "udev",
             "condition": "libs.libudev",
             "output": [ "privateFeature" ]
         },
         "gstreamer-1_0": {
-            "description": "GStreamer 1.0",
+            "label": "GStreamer 1.0",
             "disable": "input.gstreamer == '0.10' || input.gstreamer == 'no'",
             "enable": "input.gstreamer == '1.0'",
             "condition": "libs.gstreamer_1_0",
             "output": [ { "type": "publicQtConfig", "name": "gstreamer-1.0" } ]
         },
         "gstreamer-0_10": {
-            "description": "GStreamer 0.10",
+            "label": "GStreamer 0.10",
             "disable": "input.gstreamer == 'no'",
             "enable": "input.gstreamer == '0.10'",
             "condition": "!features.gstreamer-1_0 && libs.gstreamer_0_10",
             "output": [ { "type": "publicQtConfig", "name": "gstreamer-0.10" } ]
         },
         "audio-backend": {
-            "description": "Audio backend",
+            "label": "Audio backend",
             "output": [ "publicQtConfig" ]
         },
         "qml-debug": {
-            "description": "QML debugging",
+            "label": "QML debugging",
             "output": [ { "type": "publicQtConfig", "negative": true } ]
         },
         "compile_examples": {
-            "description": "Compile examples",
+            "label": "Compile examples",
             "output": [ "privateConfig" ]
         },
         "incredibuild_xge": {
-            "description": "IncrediBuild",
+            "label": "IncrediBuild",
             "emitIf": "var.QMAKE_HOST.os == 'Windows'",
             "condition": "tests.incredibuild_xge",
             "output": [ "publicConfig" ]
         },
         "msvc_mp": {
-            "description": "Use multiple processors when compiling with MSVC",
+            "label": "Use multiple processors when compiling with MSVC",
             "emitIf": "config.msvc",
             "autoDetect": "false",
             "output": [ "privateConfig" ]
         },
         "static_runtime": {
-            "description": "Statically link the C/C++ runtime library",
+            "label": "Statically link the C/C++ runtime library",
             "emitIf": "config.win32",
             "autoDetect": false,
             "condition": "!features.shared",
             "output": [ "publicConfig", "publicQtConfig" ]
         },
         "wmf-backend": {
-            "description": "Windows Media Foundation backend for Qt Multimedia",
+            "label": "Windows Media Foundation backend for Qt Multimedia",
             "emitIf": "config.win32",
             "autoDetect": false,
             "condition": "tests.wmf",
diff --git a/configure.pri b/configure.pri
index d68c7dcf7b..e20ccd8bf4 100644
--- a/configure.pri
+++ b/configure.pri
@@ -66,7 +66,7 @@ defineReplace(qtConfFunc_crossCompile) {
 
 defineTest(qtConfTest_architecture) {
     !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_out_dir = $$shadowed($$QMAKE_CONFIG_TESTS_DIR/$$test)
@@ -77,13 +77,13 @@ defineTest(qtConfTest_architecture) {
     else: android:exists($$test_out_dir/libarch.so): \
         content = $$cat($$test_out_dir/libarch.so, blob)
     else: \
-        error("$$eval($${1}.description) detection binary not found.")
+        error("$$eval($${1}.label) detection binary not found.")
 
     arch_magic = ".*==Qt=magic=Qt== Architecture:([^\\0]*).*"
     subarch_magic = ".*==Qt=magic=Qt== Sub-architecture:([^\\0]*).*"
 
     !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}.subarch = $$replace(content, $$subarch_magic, "\\1")
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index 79fede1525..af8a0e259d 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -777,17 +777,17 @@ defineTest(logn) {
 }
 
 defineTest(qtLogTestIntro) {
-    description = $$eval($${1}.description)
-    isEmpty(description): return()
+    label = $$eval($${1}.label)
+    isEmpty(label): return()
 
-    msg = "Checking for $${description}... "
+    msg = "Checking for $${label}... "
     log($$msg)
     $$QMAKE_CONFIG_VERBOSE: log("$$escape_expand(\\n)")
     write_file($$QMAKE_CONFIG_LOG, msg, append)
 }
 
 defineTest(qtLogTestResult) {
-    isEmpty($${1}.description): return()
+    isEmpty($${1}.label): return()
 
     !isEmpty($${1}.log) {
         field = $$eval($${1}.log)
@@ -1198,7 +1198,7 @@ defineReplace(qtConfCollectFeatures) {
     l =
     for (feature, $$list($${1})) {
         $$eval($${currentConfig}.features.$${feature}.available): \
-            l += $$eval($${currentConfig}.features.$${feature}.description)
+            l += $$eval($${currentConfig}.features.$${feature}.label)
     }
 
     isEmpty(l): return("<none>")
@@ -1214,7 +1214,7 @@ defineReplace(qtConfFindFirstAvailableFeature) {
         isEmpty($${currentConfig}.features.$${feature}._KEYS_): \
             error("Asking for a report on undefined feature $${2}.")
         $$eval($${currentConfig}.features.$${feature}.available): \
-            return($$eval($${currentConfig}.features.$${feature}.description))
+            return($$eval($${currentConfig}.features.$${feature}.label))
     }
 
     return("<none>")
@@ -1240,7 +1240,7 @@ defineTest(qtConfReport_feature) {
         !isEmpty(4): result = "$${4}"
     }
 
-    text = $$eval($${currentConfig}.features.$${2}.description)
+    text = $$eval($${currentConfig}.features.$${2}.label)
 
     qtConfReportPadded($${1}$$text, $$result)
 }
diff --git a/src/corelib/configure.json b/src/corelib/configure.json
index 4cccab9f5d..887e1ea5bf 100644
--- a/src/corelib/configure.json
+++ b/src/corelib/configure.json
@@ -21,21 +21,21 @@
 
     "libraries": {
         "doubleconversion": {
-            "description": "DoubleConversion",
+            "label": "DoubleConversion",
             "test": "unix/doubleconversion",
             "sources": [
                 "-ldouble-conversion"
             ]
         },
         "glib": {
-            "description": "GLib",
+            "label": "GLib",
             "test": "unix/glib",
             "sources": [
                 { "type": "pkgConfig", "args": "glib-2.0 gthread-2.0" }
             ]
         },
         "gnu_iconv": {
-            "description": "GNU libiconv",
+            "label": "GNU libiconv",
             "export": "iconv",
             "test": "unix/gnu-libiconv",
             "sources": [
@@ -43,7 +43,7 @@
             ]
         },
         "icu": {
-            "description": "ICU",
+            "label": "ICU",
             "export": "",
             "test": "unix/icu",
             "sources": [
@@ -59,7 +59,7 @@
             ]
         },
         "journald": {
-            "description": "journald",
+            "label": "journald",
             "test": "unix/journald",
             "export": "",
             "sources": [
@@ -68,14 +68,14 @@
             ]
         },
         "libatomic": {
-            "description": "64 bit atomics in libatomic",
+            "label": "64 bit atomics in libatomic",
             "test": "common/atomic64",
             "sources": [
                 "-latomic"
             ]
         },
         "libdl": {
-            "description": "dlopen() in libdl",
+            "label": "dlopen() in libdl",
             "export": "",
             "test": "unix/dlopen",
             "sources": [
@@ -83,21 +83,21 @@
             ]
         },
         "pcre": {
-            "description": "PCRE",
+            "label": "PCRE",
             "test": "unix/pcre",
             "sources": [
                 "-lpcre16"
             ]
         },
         "pps": {
-            "description": "PPS",
+            "label": "PPS",
             "test": "unix/pps",
             "sources": [
                 "-lpps"
             ]
         },
         "slog2": {
-            "description": "slog2",
+            "label": "slog2",
             "test": "unix/slog2",
             "export": "",
             "sources": [
@@ -108,92 +108,92 @@
 
     "tests": {
         "atomic64": {
-            "description": "64 bit atomics",
+            "label": "64 bit atomics",
             "type": "compile",
             "test": "common/atomic64"
         },
         "atomicfptr": {
-            "description": "working std::atomic for function pointers",
+            "label": "working std::atomic for function pointers",
             "type": "compile",
             "test": "common/atomicfptr"
         },
         "clock-gettime": {
-            "description": "clock_gettime()",
+            "label": "clock_gettime()",
             "type": "compile",
             "test": "unix/clock-gettime"
         },
         "clock-monotonic": {
-            "description": "POSIX monotonic clock",
+            "label": "POSIX monotonic clock",
             "type": "compile",
             "test": "unix/clock-monotonic"
         },
         "cloexec": {
-            "description": "O_CLOEXEC",
+            "label": "O_CLOEXEC",
             "type": "compile",
             "test": "unix/cloexec"
         },
         "dlopen": {
-            "description": "dlopen() in libc",
+            "label": "dlopen() in libc",
             "type": "compile",
             "test": "unix/dlopen"
         },
         "eventfd": {
-            "description": "eventfd",
+            "label": "eventfd",
             "type": "compile",
             "test": "unix/eventfd"
         },
         "posix-iconv": {
-            "description": "POSIX iconv",
+            "label": "POSIX iconv",
             "type": "compile",
             "test": "unix/iconv"
         },
         "sun-iconv": {
-            "description": "SUN libiconv",
+            "label": "SUN libiconv",
             "type": "compile",
             "test": "unix/sun-libiconv"
         },
         "inotify": {
-            "description": "inotify",
+            "label": "inotify",
             "type": "compile",
             "test": "unix/inotify"
         },
         "ipc_sysv": {
-            "description": "SysV IPC",
+            "label": "SysV IPC",
             "type": "compile",
             "test": "unix/ipc_sysv"
         },
         "ipc_posix": {
-            "description": "POSIX IPC",
+            "label": "POSIX IPC",
             "type": "compile",
             "test": "unix/ipc_posix"
         },
         "journald": {
-            "description": "journald",
+            "label": "journald",
             "type": "compile",
             "test": "unix/journald"
         },
         "ppoll": {
-            "description": "ppoll()",
+            "label": "ppoll()",
             "type": "compile",
             "test": "unix/ppoll"
         },
         "pollts": {
-            "description": "pollts()",
+            "label": "pollts()",
             "type": "compile",
             "test": "unix/pollts"
         },
         "poll": {
-            "description": "poll()",
+            "label": "poll()",
             "type": "compile",
             "test": "unix/poll"
         },
         "syslog": {
-            "description": "syslog",
+            "label": "syslog",
             "type": "compile",
             "test": "unix/syslog"
         },
         "xlocalescanprint": {
-            "description": "xlocale.h (or equivalents)",
+            "label": "xlocale.h (or equivalents)",
             "type": "compile",
             "test": "common/xlocalescanprint"
         }
@@ -201,111 +201,111 @@
 
     "features": {
         "clock-gettime": {
-            "description": "clock_gettime()",
+            "label": "clock_gettime()",
             "condition": "tests.clock-gettime",
             "output": [ "privateFeature" ]
         },
         "clock-monotonic": {
-            "description": "POSIX monotonic clock",
+            "label": "POSIX monotonic clock",
             "condition": "features.clock-gettime && tests.clock-monotonic",
             "output": [ "feature" ]
         },
         "dlopen": {
-            "description": "dlopen()",
+            "label": "dlopen()",
             "condition": "tests.dlopen || libs.libdl",
             "output": [ { "type": "define", "negative": true, "name": "QT_NO_DYNAMIC_LIBRARY" } ]
         },
         "libdl": {
-            "description": "dlopen() in libdl",
+            "label": "dlopen() in libdl",
             "condition": "!tests.dlopen && libs.libdl",
             "output": [ { "type": "privateConfig", "negative": true } ]
         },
         "doubleconversion": {
-            "description": "DoubleConversion",
+            "label": "DoubleConversion",
             "output": [ "privateFeature", "feature" ]
         },
         "system-doubleconversion": {
-            "description": "  Using system DoubleConversion",
+            "label": "  Using system DoubleConversion",
             "enable": "input.doubleconversion == 'system'",
             "disable": "input.doubleconversion == 'qt'",
             "condition": "features.doubleconversion && libs.doubleconversion",
             "output": [ "privateFeature" ]
         },
         "eventfd": {
-            "description": "eventfd",
+            "label": "eventfd",
             "condition": "tests.eventfd",
             "output": [ "feature" ]
         },
         "glib": {
-            "description": "GLib",
+            "label": "GLib",
             "autoDetect": "!config.win32",
             "condition": "libs.glib",
             "output": [ "privateFeature", "feature" ]
         },
         "iconv": {
-            "description": "iconv",
+            "label": "iconv",
             "condition": "features.posix-libiconv || features.sun-libiconv || features.gnu-libiconv",
             "output": [ "privateFeature", "feature" ]
         },
         "posix-libiconv": {
-            "description": "POSIX iconv",
+            "label": "POSIX iconv",
             "enable": "input.iconv == 'posix'",
             "disable": "input.iconv == 'sun' || input.iconv == 'gnu' || input.iconv == 'no'",
             "condition": "!config.win32 && !config.qnx && !config.android && !config.darwin && tests.posix-iconv"
         },
         "sun-libiconv": {
-            "description": "SUN iconv",
+            "label": "SUN iconv",
             "enable": "input.iconv == 'sun'",
             "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",
             "output": [ "privateFeature", "publicQtConfig" ]
         },
         "gnu-libiconv": {
-            "description": "GNU iconv",
+            "label": "GNU iconv",
             "enable": "input.iconv == 'gnu'",
             "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",
             "output": [ "privateFeature" ]
         },
         "icu": {
-            "description": "ICU",
+            "label": "ICU",
             "autoDetect": "!config.win32",
             "condition": "libs.icu",
             "output": [ "privateFeature" ]
         },
         "inotify": {
-            "description": "inotify",
+            "label": "inotify",
             "condition": "tests.inotify",
             "output": [ "privateFeature", "feature" ]
         },
         "ipc_posix": {
-            "description": "Using POSIX IPC",
+            "label": "Using POSIX IPC",
             "autoDetect": "!config.win32",
             "condition": "!tests.ipc_sysv && tests.ipc_posix",
             "output": [ { "type": "define", "name": "QT_POSIX_IPC" } ]
         },
         "journald": {
-            "description": "journald",
+            "label": "journald",
             "autoDetect": false,
             "condition": "libs.journald",
             "output": [ "privateConfig" ]
         },
         "std-atomic64": {
-            "description": "64 bit atomic operations",
+            "label": "64 bit atomic operations",
             "condition": "tests.atomic64 || libs.libatomic",
             "output": [ { "type": "define", "negative": true, "name": "QT_NO_STD_ATOMIC64" } ]
         },
         "libatomic": {
-            "description": "64 bit atomic operations in libatomic",
+            "label": "64 bit atomic operations in libatomic",
             "condition": "!tests.atomic64 && libs.libatomic",
             "output": [ "privateFeature" ]
         },
         "mimetype": {
-            "description": "Mimetype handling",
+            "label": "Mimetype handling",
             "output": [ "publicFeature", "feature" ]
         },
         "system-pcre": {
-            "description": "Using system PCRE",
+            "label": "Using system PCRE",
             "disable": "input.pcre == 'qt'",
             "enable": "input.pcre == 'system'",
             "condition": "libs.pcre",
@@ -315,25 +315,25 @@
             ]
         },
         "poll_ppoll": {
-            "description": "Native ppoll()",
+            "label": "Native ppoll()",
             "emitIf": "!config.win32",
             "condition": "tests.ppoll",
             "output": [ "privateFeature" ]
         },
         "poll_pollts": {
-            "description": "Native pollts()",
+            "label": "Native pollts()",
             "emitIf": "!config.win32",
             "condition": "!features.poll_ppoll && tests.pollts",
             "output": [ "privateFeature" ]
         },
         "poll_poll": {
-            "description": "Native poll()",
+            "label": "Native poll()",
             "emitIf": "!config.win32",
             "condition": "!features.poll_ppoll && !features.poll_pollts && tests.poll",
             "output": [ "privateFeature" ]
         },
         "poll_select": {
-            "description": "Emulated poll()",
+            "label": "Emulated poll()",
             "emitIf": "!config.win32",
             "condition": "!features.poll_ppoll && !features.poll_pollts && !features.poll_poll",
             "output": [
@@ -342,39 +342,39 @@
             ]
         },
         "qqnx_pps": {
-            "description": "PPS",
+            "label": "PPS",
             "emitIf": "config.qnx",
             "condition": "libs.pps",
             "output": [ "privateConfig" ]
         },
         "qeventtransition": {
-            "description": "QEventTransition class",
+            "label": "QEventTransition class",
             "output": [ "publicFeature" ]
         },
         "sharedmemory": {
-            "description": "Enable QSharedMemory",
+            "label": "Enable QSharedMemory",
             "condition": "config.android || config.win32 || tests.ipc_sysv || tests.ipc_posix",
             "output": [ { "type": "define", "negative": true, "name": "QT_NO_SHAREDMEMORY" } ]
         },
         "slog2": {
-            "description": "slog2",
+            "label": "slog2",
             "condition": "libs.slog2",
             "emitIf": "config.qnx",
             "output": [ "privateConfig" ]
         },
         "syslog": {
-            "description": "syslog",
+            "label": "syslog",
             "autoDetect": false,
             "condition": "tests.syslog",
             "output": [ "privateConfig" ]
         },
         "systemsemaphore": {
-            "description": "Enable QSystemSemaphore",
+            "label": "Enable QSystemSemaphore",
             "condition": "config.android || config.win32 || tests.ipc_sysv || tests.ipc_posix",
             "output": [ { "type": "define", "negative": true, "name": "QT_NO_SYSTEMSEMAPHORE" } ]
         },
         "threadsafe-cloexec": {
-            "description": "Threadsafe pipe creation",
+            "label": "Threadsafe pipe creation",
             "condition": "tests.cloexec",
             "output": [
                 "publicQtConfig",
diff --git a/src/gui/configure.json b/src/gui/configure.json
index c662c0a524..8513bff5d0 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -55,14 +55,14 @@
             ]
         },
         "directfb": {
-            "description": "DirectFB",
+            "label": "DirectFB",
             "test": "qpa/directfb",
             "sources": [
                 { "type": "pkgConfig", "args": "directfb" }
             ]
         },
         "directwrite": {
-            "description": "DirectWrite",
+            "label": "DirectWrite",
             "export": "",
             "test": "win/directwrite",
             "sources": [
@@ -70,7 +70,7 @@
             ]
         },
         "drm": {
-            "description": "KMS",
+            "label": "KMS",
             "test": "qpa/kms",
             "sources": [
                 { "type": "pkgConfig", "args": "libdrm" },
@@ -78,7 +78,7 @@
             ]
         },
         "egl": {
-            "description": "EGL",
+            "label": "EGL",
             "test": "qpa/egl",
             "sources": [
                 { "type": "pkgConfig", "args": "egl" },
@@ -86,7 +86,7 @@
             ]
         },
         "freetype": {
-            "description": "FreeType",
+            "label": "FreeType",
             "export": "",
             "test": "unix/freetype",
             "sources": [
@@ -94,7 +94,7 @@
             ]
         },
         "fontconfig": {
-            "description": "Fontconfig",
+            "label": "Fontconfig",
             "test": "unix/fontconfig",
             "sources": [
                 { "type": "pkgConfig", "args": "fontconfig freetype2" },
@@ -102,21 +102,21 @@
             ]
         },
         "gbm": {
-            "description": "GBM",
+            "label": "GBM",
             "test": "qpa/gbm",
             "sources": [
                 { "type": "pkgConfig", "args": "gbm" }
             ]
         },
         "harfbuzz": {
-            "description": "HarfBuzz",
+            "label": "HarfBuzz",
             "test": "unix/harfbuzz",
             "sources": [
                 "-lharfbuzz"
             ]
         },
         "imf": {
-            "description": "IMF",
+            "label": "IMF",
             "export": "",
             "test": "unix/qqnx_imf",
             "sources": [
@@ -124,21 +124,21 @@
             ]
         },
         "lgmon": {
-            "description": "lgmon",
+            "label": "lgmon",
             "test": "unix/lgmon",
             "sources": [
                 "-llgmon"
             ]
         },
         "libinput": {
-            "description": "libinput",
+            "label": "libinput",
             "test": "unix/libinput",
             "sources": [
                 { "type": "pkgConfig", "args": "libinput" }
             ]
         },
         "libjpeg": {
-            "description": "libjpeg",
+            "label": "libjpeg",
             "test": "unix/libjpeg",
             "sources": [
                 { "libs": "-llibjpeg", "condition": "config.msvc" },
@@ -146,7 +146,7 @@
             ]
         },
         "libpng": {
-            "description": "libpng",
+            "label": "libpng",
             "test": "unix/libpng",
             "sources": [
                 { "type": "pkgConfig", "args": "libpng" },
@@ -155,7 +155,7 @@
             ]
         },
         "mirclient": {
-            "description": "Mir client libraries",
+            "label": "Mir client libraries",
             "export": "",
             "test": "qpa/mirclient",
             "sources": [
@@ -163,7 +163,7 @@
             ]
         },
         "mtdev": {
-            "description": "mtdev",
+            "label": "mtdev",
             "export": "",
             "test": "unix/mtdev",
             "sources": [
@@ -171,7 +171,7 @@
             ]
         },
         "opengl": {
-            "description": "Desktop OpenGL",
+            "label": "Desktop OpenGL",
             "test": "unix/opengldesktop",
             "sources": [
                 { "type": "pkgConfig", "args": "gl" },
@@ -179,7 +179,7 @@
             ]
         },
         "opengl_es2": {
-            "description": "OpenGL ES 2.0",
+            "label": "OpenGL ES 2.0",
             "test": "unix/opengles2",
             "sources": [
                 { "type": "pkgConfig", "args": "glesv2" },
@@ -187,14 +187,14 @@
             ]
         },
         "tslib": {
-            "description": "tslib",
+            "label": "tslib",
             "test": "unix/tslib",
             "sources": [
                 "-lts"
             ]
         },
         "wayland_server": {
-            "description": "Wayland Server",
+            "label": "Wayland Server",
             "export": "",
             "test": "qpa/wayland-server",
             "sources": [
@@ -202,13 +202,13 @@
             ]
         },
         "x11sm": {
-            "description": "X11 session management",
+            "label": "X11 session management",
             "sources": [
                 { "type": "pkgConfig", "args": "sm ice" }
             ]
         },
         "xcb": {
-            "description": "XCB >= 1.5 (core)",
+            "label": "XCB >= 1.5 (core)",
             "test": "qpa/xcb",
             "sources": [
                 { "type": "pkgConfig", "args": "xcb >= 1.5" },
@@ -216,7 +216,7 @@
             ]
         },
         "xcb_syslibs": {
-            "description": "XCB (secondary)",
+            "label": "XCB (secondary)",
             "test": "qpa/xcb-syslibs",
             "sources": [
                 { "type": "pkgConfig",
@@ -225,7 +225,7 @@
             ]
         },
         "xcb_xlib": {
-            "description": "XCB Xlib",
+            "label": "XCB Xlib",
             "test": "qpa/xcb-xlib",
             "sources": [
                 { "type": "pkgConfig", "args": "X11-xcb x11 xcb" },
@@ -233,7 +233,7 @@
             ]
         },
         "xcb_xkb": {
-            "description": "XCB XKB >= 1.10",
+            "label": "XCB XKB >= 1.10",
             "test": "qpa/xcb-xkb",
             "sources": [
                 { "type": "pkgConfig", "args": "xcb-xkb >= 1.10 xcb" },
@@ -241,7 +241,7 @@
             ]
         },
         "xcb_render": {
-            "description": "XCB XRender",
+            "label": "XCB XRender",
             "test": "qpa/xcb-render",
             "sources": [
                 { "type": "pkgConfig", "args": "xcb-renderutil xcb-render xcb" },
@@ -249,7 +249,7 @@
             ]
         },
         "xcb_glx": {
-            "description": "XCB GLX",
+            "label": "XCB GLX",
             "test": "qpa/xcb-glx",
             "sources": [
                 { "type": "pkgConfig", "args": "xcb-glx xcb" },
@@ -257,7 +257,7 @@
             ]
         },
         "xinput2": {
-            "description": "Xinput2",
+            "label": "Xinput2",
             "test": "x11/xinput2",
             "sources": [
                 { "type": "pkgConfig", "args": "xi" },
@@ -265,7 +265,7 @@
             ]
         },
         "xkbcommon": {
-            "description": "xkbcommon",
+            "label": "xkbcommon",
             "export": "xkbcommon_evdev",
             "test": "unix/xkbcommon",
             "sources": [
@@ -273,14 +273,14 @@
             ]
         },
         "xkbcommon_x11": {
-            "description": "xkbcommon-x11 >= 0.4.1",
+            "label": "xkbcommon-x11 >= 0.4.1",
             "export": "xkbcommon",
             "sources": [
                 { "type": "pkgConfig", "args": "xkbcommon xkbcommon-x11 >= 0.4.1" }
             ]
         },
         "xrender": {
-            "description": "XRender",
+            "label": "XRender",
             "test": "x11/xrender",
             "sources": [
                 "-lXrender"
@@ -295,19 +295,19 @@
 
     "tests": {
         "direct2d": {
-            "description": "Direct 2D",
+            "label": "Direct 2D",
             "type": "compile",
             "test": "qpa/direct2d",
             "use": "direct2d"
         },
         "directwrite2": {
-            "description": "DirectWrite 2",
+            "label": "DirectWrite 2",
             "type": "compile",
             "test": "win/directwrite2",
             "use": "directwrite"
         },
         "directx": {
-            "description": "DirectX SDK",
+            "label": "DirectX SDK",
             "type": "directX",
             "files": [
                 "d3dcompiler.h",
@@ -316,70 +316,70 @@
             ]
         },
         "egl-x11": {
-            "description": "EGL on X11",
+            "label": "EGL on X11",
             "type": "compile",
             "test": "qpa/egl-x11",
             "use": "egl xcb_xlib"
         },
         "egl-brcm": {
-            "description": "Broadcom EGL (Rasberry Pi)",
+            "label": "Broadcom EGL (Rasberry Pi)",
             "type": "compile",
             "test": "qpa/eglfs-brcm",
             "use": "egl bcm_host"
         },
         "egl-egldevice": {
-            "description": "EGLDevice",
+            "label": "EGLDevice",
             "type": "compile",
             "test": "qpa/eglfs-egldevice",
             "use": "egl"
         },
         "egl-mali": {
-            "description": "Mali EGL",
+            "label": "Mali EGL",
             "type": "compile",
             "test": "qpa/eglfs-mali",
             "use": "egl"
         },
         "egl-mali-2": {
-            "description": "Mali 2 EGL",
+            "label": "Mali 2 EGL",
             "type": "compile",
             "test": "qpa/eglfs-mali-2",
             "use": "egl"
         },
         "egl-viv": {
-            "description": "i.Mx6 EGL",
+            "label": "i.Mx6 EGL",
             "type": "compile",
             "test": "qpa/eglfs-viv",
             "use": "egl"
         },
         "evdev": {
-            "description": "evdev",
+            "label": "evdev",
             "type": "compile",
             "test": "unix/evdev"
         },
         "linuxfb": {
-            "description": "LinuxFB",
+            "label": "LinuxFB",
             "type": "compile",
             "test": "qpa/linuxfb"
         },
         "opengles3": {
-            "description": "OpenGL ES 3.0",
+            "label": "OpenGL ES 3.0",
             "type": "compile",
             "test": "unix/opengles3",
             "use": "opengl_es2"
         },
         "opengles31": {
-            "description": "OpenGL ES 3.1",
+            "label": "OpenGL ES 3.1",
             "type": "compile",
             "test": "unix/opengles31",
             "use": "opengl_es2"
         },
         "qpa_default_platform": {
-            "description": "default QPA platform",
+            "label": "default QPA platform",
             "type": "qpaDefaultPlatform",
             "log": "value"
         },
         "x11prefix": {
-            "description": "X11 prefix",
+            "label": "X11 prefix",
             "type": "getPkgConfigVariable",
             "pkg-config-args": "x11",
             "pkg-config-variable": "prefix",
@@ -387,14 +387,14 @@
             "log": "value"
         },
         "xkbconfigroot": {
-            "description": "XKB config root",
+            "label": "XKB config root",
             "type": "xkbConfigRoot",
             "pkg-config-args": "xkeyboard-config",
             "pkg-config-variable": "xkb_base",
             "log": "value"
         },
         "xlib": {
-            "description": "XLib",
+            "label": "XLib",
             "type": "compile",
             "test": "x11/xlib"
         }
@@ -402,12 +402,12 @@
 
     "features": {
         "accessibility-atspi-bridge": {
-            "description": "ATSPI Bridge",
+            "label": "ATSPI Bridge",
             "condition": "features.accessibility && features.xcb && features.dbus",
             "output": [ "privateFeature", "feature" ]
         },
         "angle": {
-            "description": "ANGLE",
+            "label": "ANGLE",
             "autoDetect": "features.opengles2 || features.opengl-dynamic",
             "condition": "config.win32 && tests.directx",
             "output": [
@@ -416,40 +416,40 @@
             ]
         },
         "directfb": {
-            "description": "DirectFB",
+            "label": "DirectFB",
             "autoDetect": false,
             "condition": "libs.directfb",
             "output": [ "privateFeature" ]
         },
         "directwrite": {
-            "description": "DirectWrite",
+            "label": "DirectWrite",
             "emitIf": "config.win32",
             "condition": "libs.directwrite",
             "output": [ "privateFeature" ]
         },
         "directwrite2": {
-            "description": "DirectWrite 2",
+            "label": "DirectWrite 2",
             "emitIf": "config.win32",
             "condition": "features.directwrite && tests.directwrite2",
             "output": [ "privateFeature" ]
         },
         "direct2d": {
-            "description": "Direct 2D",
+            "label": "Direct 2D",
             "autoDetect": false,
             "condition": "tests.direct2d",
             "output": [ "privateFeature" ]
         },
         "evdev": {
-            "description": "evdev",
+            "label": "evdev",
             "condition": "tests.evdev",
             "output": [ "privateFeature" ]
         },
         "freetype": {
-            "description": "FreeType",
+            "label": "FreeType",
             "output": [ "privateFeature", "feature" ]
         },
         "system-freetype": {
-            "description": "  Using system FreeType",
+            "label": "  Using system FreeType",
             "enable": "input.freetype == 'system'",
             "disable": "input.freetype == 'qt'",
             "autoDetect": "!config.win32",
@@ -457,21 +457,21 @@
             "output": [ "privateFeature" ]
         },
         "fontconfig": {
-            "description": "Fontconfig",
+            "label": "Fontconfig",
             "condition": "!config.win32 && !config.darwin && features.system-freetype && libs.fontconfig",
             "output": [ "privateFeature", "feature" ]
         },
         "gbm": {
-            "description": "GBM",
+            "label": "GBM",
             "condition": "libs.gbm",
             "output": [ "publicQtConfig" ]
         },
         "harfbuzz": {
-            "description": "HarfBuzz",
+            "label": "HarfBuzz",
             "output": [ "privateFeature", "feature" ]
         },
         "system-harfbuzz": {
-            "description": "  Using system HarfBuzz",
+            "label": "  Using system HarfBuzz",
             "enable": "input.harfbuzz == 'system'",
             "disable": "input.harfbuzz == 'qt'",
             "autoDetect": "!config.darwin && !config.win32",
@@ -479,49 +479,49 @@
             "output": [ "privateFeature" ]
         },
         "qqnx_imf": {
-            "description": "IMF",
+            "label": "IMF",
             "emitIf": "config.qnx",
             "condition": "libs.imf",
             "output": [ "privateConfig" ]
         },
         "integrityfb": {
-            "description": "INTEGRITY framebuffer",
+            "label": "INTEGRITY framebuffer",
             "condition": "config.integrity",
             "output": [ "privateFeature" ]
         },
         "kms": {
-            "description": "KMS",
+            "label": "KMS",
             "condition": "libs.drm",
             "output": [ "publicQtConfig" ]
         },
         "libinput": {
-            "description": "libinput",
+            "label": "libinput",
             "condition": "features.libudev && libs.libinput",
             "output": [ "privateFeature" ]
         },
         "lgmon": {
-            "description": "lgmon",
+            "label": "lgmon",
             "emitIf": "config.qnx",
             "condition": "libs.lgmon",
             "output": [ "privateConfig" ]
         },
         "linuxfb": {
-            "description": "LinuxFB",
+            "label": "LinuxFB",
             "condition": "tests.linuxfb",
             "output": [ "privateFeature" ]
         },
         "mirclient": {
-            "description": "Mir client",
+            "label": "Mir client",
             "condition": "libs.mirclient",
             "output": [ "privateFeature" ]
         },
         "mtdev": {
-            "description": "mtdev",
+            "label": "mtdev",
             "condition": "libs.mtdev",
             "output": [ "privateFeature" ]
         },
         "opengles2": {
-            "description": "OpenGL ES 2.0",
+            "label": "OpenGL ES 2.0",
             "enable": "input.opengl == 'es2'",
             "disable": "input.opengl == 'desktop' || input.opengl == 'dynamic' || input.opengl == 'no'",
             "condition": "config.win32 || (!config.watchos && !features.opengl-desktop && libs.opengl_es2)",
@@ -533,7 +533,7 @@
             ]
         },
         "opengles3": {
-            "description": "OpenGL ES 3.0",
+            "label": "OpenGL ES 3.0",
             "condition": "features.opengles2 && !features.angle && tests.opengles3",
             "output": [
                 "publicFeature",
@@ -541,7 +541,7 @@
             ]
         },
         "opengles31": {
-            "description": "OpenGL ES 3.1",
+            "label": "OpenGL ES 3.1",
             "condition": "features.opengles3 && tests.opengles31",
             "output": [
                 "publicFeature",
@@ -549,14 +549,14 @@
             ]
         },
         "opengl-desktop": {
-            "description": "Desktop OpenGL",
+            "label": "Desktop OpenGL",
             "enable": "input.opengl == 'desktop'",
             "disable": "input.opengl == 'es2' || input.opengl == 'dynamic' || input.opengl == 'no'",
             "condition": "(config.win32 && !config.winrt && !features.opengles2 && (config.msvc || libs.opengl))
                           || (!config.watchos && !config.win32 && libs.opengl)"
         },
         "opengl-dynamic": {
-            "description": "Dynamic OpenGL",
+            "label": "Dynamic OpenGL",
             "enable": "input.opengl == 'dynamic'",
             "autoDetect": false,
             "condition": "config.win32 && !config.winrt",
@@ -566,69 +566,69 @@
             ]
         },
         "opengl": {
-            "description": "OpenGL",
+            "label": "OpenGL",
             "condition": "features.opengl-desktop || features.opengl-dynamic || features.opengles2",
             "output": [ "publicFeature", "feature" ]
         },
         "egl": {
-            "description": "EGL",
+            "label": "EGL",
             "condition": "features.opengl && (features.angle || libs.egl)",
             "output": [ "privateFeature", "feature" ]
         },
         "egl_x11": {
-            "description": "EGL on X11",
+            "label": "EGL on X11",
             "condition": "features.egl && tests.egl-x11",
             "output": [ "privateFeature" ]
         },
         "eglfs": {
-            "description": "EGLFS",
+            "label": "EGLFS",
             "autoDetect": "!config.android && !config.win32",
             "condition": "features.egl",
             "output": [ "privateFeature" ]
         },
         "eglfs_brcm": {
-            "description": "EGLFS Rasberry Pi",
+            "label": "EGLFS Rasberry Pi",
             "condition": "features.eglfs && tests.egl-brcm",
             "output": [ "privateFeature" ]
         },
         "eglfs_egldevice": {
-            "description": "EGLFS EGLDevice",
+            "label": "EGLFS EGLDevice",
             "condition": "features.eglfs && tests.egl-egldevice && features.kms",
             "output": [ "privateFeature" ]
         },
         "eglfs_gbm": {
-            "description": "EGLFS GBM",
+            "label": "EGLFS GBM",
             "condition": "features.eglfs && features.gbm && features.kms",
             "output": [ "privateFeature" ]
         },
         "eglfs_mali": {
-            "description": "EGLFS Mali",
+            "label": "EGLFS Mali",
             "condition": "features.eglfs && (tests.egl-mali || tests.egl-mali-2)",
             "output": [ "privateFeature" ]
         },
         "eglfs_viv": {
-            "description": "EGLFS i.Mx6",
+            "label": "EGLFS i.Mx6",
             "condition": "features.eglfs && tests.egl-viv",
             "output": [ "privateFeature" ]
         },
         "eglfs_viv_wl": {
-            "description": "EGLFS i.Mx6 Wayland",
+            "label": "EGLFS i.Mx6 Wayland",
             "condition": "features.eglfs_viv && libs.wayland_server",
             "output": [ "privateFeature" ]
         },
         "gif": {
-            "description": "GIF",
+            "label": "GIF",
             "output": [
                 "privateFeature",
                 { "type": "define", "negative": true, "name": "QT_NO_IMAGEFORMAT_GIF" }
             ]
         },
         "ico": {
-            "description": "ICO",
+            "label": "ICO",
             "output": [ "privateFeature", "feature" ]
         },
         "jpeg": {
-            "description": "JPEG",
+            "label": "JPEG",
             "disable": "input.libjpeg == 'no'",
             "output": [
                 "privateFeature",
@@ -636,14 +636,14 @@
             ]
         },
         "system-jpeg": {
-            "description": "  Using system libjpeg",
+            "label": "  Using system libjpeg",
             "disable": "input.libjpeg == 'qt'",
             "enable": "input.libjpeg == 'system'",
             "condition": "features.jpeg && libs.libjpeg",
             "output": [ "privateFeature" ]
         },
         "png": {
-            "description": "PNG",
+            "label": "PNG",
             "disable": "input.libpng == 'no'",
             "output": [
                 "privateFeature",
@@ -651,14 +651,14 @@
             ]
         },
         "system-png": {
-            "description": "  Using system libpng",
+            "label": "  Using system libpng",
             "disable": "input.libpng == 'qt'",
             "enable": "input.libpng == 'system'",
             "condition": "features.png && libs.libpng",
             "output": [ "privateFeature" ]
         },
         "qpa_default_platform": {
-            "description": "QPA default platform",
+            "label": "QPA default platform",
             "condition": "features.gui",
             "output": [
                 { "type": "define", "name": "QT_QPA_DEFAULT_PLATFORM_NAME", "value": "tests.qpa_default_platform.name" },
@@ -667,22 +667,22 @@
             ]
         },
         "sessionmanager": {
-            "description": "Session Management",
+            "label": "Session Management",
             "output": [ "feature" ]
         },
         "tslib": {
-            "description": "tslib",
+            "label": "tslib",
             "condition": "libs.tslib",
             "output": [ "privateFeature" ]
         },
         "xcb": {
-            "description": "XCB",
+            "label": "XCB",
             "autoDetect": "!config.darwin",
             "condition": "libs.xcb",
             "output": [ "privateFeature" ]
         },
         "system-xcb": {
-            "description": "Using system provided XCB libraries",
+            "label": "Using system provided XCB libraries",
             "enable": "input.xcb == 'system' || input.xcb == 'yes'",
             "disable": "input.xcb == 'qt' || input.xcb == 'no'",
             "autoDetect": "!config.darwin",
@@ -690,46 +690,46 @@
             "output": [ "privateFeature" ]
         },
         "x11-prefix": {
-            "description": "X11 prefix",
+            "label": "X11 prefix",
             "emitIf": "features.xcb",
             "output": [ { "type": "varAssign", "name": "QMAKE_X11_PREFIX", "value": "tests.x11prefix.value" } ]
         },
         "xcb-glx": {
-            "description": "XCB GLX",
+            "label": "XCB GLX",
             "emitIf": "features.xcb",
             "condition": "libs.xcb_glx",
             "output": [ "privateFeature" ]
         },
         "xcb-render": {
-            "description": "XCB render",
+            "label": "XCB render",
             "emitIf": "features.system-xcb",
             "condition": "libs.xcb_render",
             "output": [ "privateFeature" ]
         },
         "xcb-xlib": {
-            "description": "XCB Xlib",
+            "label": "XCB Xlib",
             "emitIf": "features.xcb",
             "condition": "libs.xcb_xlib",
             "output": [ "privateFeature" ]
         },
         "xcb-sm": {
-            "description": "xcb-sm",
+            "label": "xcb-sm",
             "emitIf": "features.xcb",
             "condition": "features.sessionmanager && libs.x11sm",
             "output": [ "privateFeature" ]
         },
         "xinput2": {
-            "description": "Xinput2",
+            "label": "Xinput2",
             "condition": "libs.xinput2",
             "output": [ "privateFeature" ]
         },
         "xkbcommon-evdev": {
-            "description": "xkbcommon-evdev",
+            "label": "xkbcommon-evdev",
             "condition": "libs.xkbcommon",
             "output": [ "privateFeature" ]
         },
         "xkbcommon-system": {
-            "description": "Using system-provided xkbcommon",
+            "label": "Using system-provided xkbcommon",
             "emitIf": "features.xcb",
             "enable": "input.xkbcommon == 'system'",
             "disable": "input.xkbcommon == 'qt' || input.xkbcommon == 'no'",
@@ -737,23 +737,23 @@
             "output": [ "privateFeature" ]
         },
         "xkb": {
-            "description": "XCB XKB",
+            "label": "XCB XKB",
             "condition": "features.system-xcb && libs.xcb_xkb",
             "output": [ "privateFeature" ]
         },
         "xkb-config-root": {
-            "description": "XKB config root",
+            "label": "XKB config root",
             "emitIf": "features.xcb",
             "condition": "features.xcb && !features.xkbcommon-system && tests.xkbconfigroot",
             "output": [ { "type": "varAssign", "name": "QMAKE_XKB_CONFIG_ROOT", "value": "tests.xkbconfigroot.value"} ]
         },
         "xlib": {
-            "description": "XLib",
+            "label": "XLib",
             "condition": "tests.xlib",
             "output": [ "privateFeature" ]
         },
         "xrender": {
-            "description": "Xrender",
+            "label": "Xrender",
             "condition": "libs.xrender",
             "output": [ "privateFeature", "feature" ]
         }
diff --git a/src/network/configure.json b/src/network/configure.json
index a647439b19..3372d177c3 100644
--- a/src/network/configure.json
+++ b/src/network/configure.json
@@ -26,7 +26,7 @@
 
     "libraries": {
         "corewlan": {
-            "description": "CoreWLan",
+            "label": "CoreWLan",
             "export": "",
             "test": "mac/corewlan",
             "sources": [
@@ -40,14 +40,14 @@
             ]
         },
         "libproxy": {
-            "description": "libproxy",
+            "label": "libproxy",
             "test": "common/libproxy",
             "sources": [
                 "-lproxy"
             ]
         },
         "openssl": {
-            "description": "OpenSSL Libraries",
+            "label": "OpenSSL Libraries",
             "export": "",
             "sources": [
                 { "type": "openssl" },
@@ -68,30 +68,30 @@
 
     "tests": {
         "getaddrinfo": {
-            "description": "getaddrinfo()",
+            "label": "getaddrinfo()",
             "type": "compile",
             "test": "unix/getaddrinfo",
             "use": "network"
         },
         "getifaddrs": {
-            "description": "getifaddrs()",
+            "label": "getifaddrs()",
             "type": "compile",
             "test": "unix/getifaddrs",
             "use": "network"
         },
         "ipv6ifname": {
-            "description": "IPv6 ifname",
+            "label": "IPv6 ifname",
             "type": "compile",
             "test": "unix/ipv6ifname",
             "use": "network"
         },
         "openssl": {
-            "description": "OpenSSL",
+            "label": "OpenSSL",
             "type": "compile",
             "test": "unix/openssl"
         },
         "sctp": {
-            "description": "SCTP support",
+            "label": "SCTP support",
             "type": "compile",
             "test": "unix/sctp",
             "use": "network"
@@ -100,34 +100,34 @@
 
     "features": {
         "corewlan": {
-            "description": "CoreWLan",
+            "label": "CoreWLan",
             "condition": "libs.corewlan",
             "emitIf": "config.darwin",
             "output": [ "feature", "privateFeature" ]
         },
         "getaddrinfo": {
-            "description": "getaddrinfo()",
+            "label": "getaddrinfo()",
             "condition": "tests.getaddrinfo",
             "output": [ "feature" ]
         },
         "getifaddrs": {
-            "description": "getifaddrs()",
+            "label": "getifaddrs()",
             "condition": "tests.getifaddrs",
             "output": [ "feature" ]
         },
         "ipv6ifname": {
-            "description": "IPv6 ifname",
+            "label": "IPv6 ifname",
             "condition": "tests.ipv6ifname",
             "output": [ "feature" ]
         },
         "libproxy": {
-            "description": "libproxy",
+            "label": "libproxy",
             "autoDetect": false,
             "condition": "libs.libproxy",
             "output": [ "privateFeature" ]
         },
         "openssl": {
-            "description": "OpenSSL",
+            "label": "OpenSSL",
             "enable": "input.openssl == 'yes' || input.openssl == 'linked' || input.openssl == 'runtime'",
             "disable": "input.openssl == 'no' || input.ssl == 'no'",
             "autoDetect": "!config.winrt",
@@ -139,7 +139,7 @@
             ]
         },
         "openssl-linked": {
-            "description": "  Qt directly linked to OpenSSL",
+            "label": "  Qt directly linked to OpenSSL",
             "enable": "input.openssl == 'linked'",
             "disable": "input.openssl != 'linked'",
             "condition": "features.openssl && libs.openssl",
@@ -154,7 +154,7 @@
             ]
         },
         "securetransport": {
-            "description": "SecureTransport",
+            "label": "SecureTransport",
             "disable": "input.securetransport == 'no' || input.ssl == 'no'",
             "condition": "config.darwin && (input.openssl == '' || input.openssl == 'no')",
             "output": [
@@ -163,18 +163,18 @@
             ]
         },
         "ssl": {
-            "description": "SSL",
+            "label": "SSL",
             "condition": "config.winrt || features.securetransport || features.openssl",
             "output": [ "publicFeature", "feature" ]
         },
         "sctp": {
-            "description": "SCTP",
+            "label": "SCTP",
             "autoDetect": false,
             "condition": "tests.sctp",
             "output": [ "publicFeature", "feature" ]
         },
         "system-proxies": {
-            "description": "Use system proxies",
+            "label": "Use system proxies",
             "output": [ "privateFeature" ]
         }
     },
diff --git a/src/printsupport/configure.json b/src/printsupport/configure.json
index 986bb9d678..6bf4208e9c 100644
--- a/src/printsupport/configure.json
+++ b/src/printsupport/configure.json
@@ -15,7 +15,7 @@
 
     "libraries": {
         "cups": {
-            "description": "CUPS",
+            "label": "CUPS",
             "test": "unix/cups",
             "sources": [
                 "-lcups"
@@ -25,7 +25,7 @@
 
     "features": {
         "cups": {
-            "description": "CUPS",
+            "label": "CUPS",
             "condition": "libs.cups",
             "output": [ "privateFeature", "feature" ]
         }
diff --git a/src/sql/configure.json b/src/sql/configure.json
index 2277fcb546..d1dc198656 100644
--- a/src/sql/configure.json
+++ b/src/sql/configure.json
@@ -39,7 +39,7 @@
 
     "libraries": {
         "db2": {
-            "description": "DB2 (IBM)",
+            "label": "DB2 (IBM)",
             "test": "unix/db2",
             "sources": [
                 { "libs": "-ldb2cli", "condition": "config.win32" },
@@ -47,7 +47,7 @@
             ]
         },
         "ibase": {
-            "description": "InterBase",
+            "label": "InterBase",
             "test": "unix/ibase",
             "sources": [
                 { "libs": "-lgds32_ms", "condition": "config.win32" },
@@ -55,7 +55,7 @@
             ]
         },
         "mysql": {
-            "description": "MySQL",
+            "label": "MySQL",
             "test": "unix/mysql",
             "sources": [
                 { "type": "mysqlConfig", "query": "--libs_r" },
@@ -66,7 +66,7 @@
             ]
         },
         "psql": {
-            "description": "PostgreSQL",
+            "label": "PostgreSQL",
             "test": "unix/psql",
             "sources": [
                 { "type": "psqlConfig" },
@@ -75,7 +75,7 @@
             ]
         },
         "tds": {
-            "description": "TDS (Sybase)",
+            "label": "TDS (Sybase)",
             "test": "unix/tds",
             "sources": [
                 { "type": "sybaseEnv", "libs": "-lNTWDBLIB", "condition": "config.win32" },
@@ -83,7 +83,7 @@
             ]
         },
         "oci": {
-            "description": "OCI (Oracle)",
+            "label": "OCI (Oracle)",
             "test": "unix/oci",
             "sources": [
                 { "libs": "-loci", "condition": "config.win32" },
@@ -91,7 +91,7 @@
             ]
         },
         "odbc": {
-            "description": "ODBC",
+            "label": "ODBC",
             "test": "unix/odbc",
             "sources": [
                 { "libs": "-lodbc32", "condition": "config.win32" },
@@ -100,14 +100,14 @@
             ]
         },
         "sqlite2": {
-            "description": "SQLite (version 2)",
+            "label": "SQLite (version 2)",
             "test": "unix/sqlite2",
             "sources": [
                 "-lsqlite"
             ]
         },
         "sqlite3": {
-            "description": "SQLite (version 3)",
+            "label": "SQLite (version 3)",
             "export": "sqlite",
             "test": "unix/sqlite",
             "sources": [
@@ -123,57 +123,57 @@
 
     "features": {
         "sql-db2": {
-            "description": "DB2 (IBM)",
+            "label": "DB2 (IBM)",
             "condition": "libs.db2",
             "output": [ "publicFeature" ]
         },
         "sql-ibase": {
-            "description": "InterBase",
+            "label": "InterBase",
             "condition": "libs.ibase",
             "output": [ "publicFeature" ]
         },
         "sql-mysql": {
-            "description": "MySql",
+            "label": "MySql",
             "condition": "libs.mysql",
             "output": [ "publicFeature" ]
         },
         "use_libmysqlclient_r": {
-            "description": "MySql (threadsafe)",
+            "label": "MySql (threadsafe)",
             "condition": "features.sql-mysql && (libs.mysql.source == 0 || libs.mysql.source == 2)",
             "output": [ "privateConfig" ]
         },
         "sql-oci": {
-            "description": "OCI (Oracle)",
+            "label": "OCI (Oracle)",
             "condition": "libs.oci",
             "output": [ "publicFeature" ]
         },
         "sql-odbc": {
-            "description": "ODBC",
+            "label": "ODBC",
             "condition": "libs.odbc",
             "output": [ "publicFeature" ]
         },
         "sql-psql": {
-            "description": "PostgreSQL",
+            "label": "PostgreSQL",
             "condition": "libs.psql",
             "output": [ "publicFeature" ]
         },
         "sql-sqlite2": {
-            "description": "SQLite2",
+            "label": "SQLite2",
             "condition": "libs.sqlite2",
             "output": [ "publicFeature" ]
         },
         "sql-sqlite": {
-            "description": "SQLite",
+            "label": "SQLite",
             "output": [ "publicFeature" ]
         },
         "system-sqlite": {
-            "description": "  Using system provided SQLite",
+            "label": "  Using system provided SQLite",
             "autoDetect": false,
             "condition": "features.sql-sqlite && libs.sqlite3",
             "output": [ "publicQtConfig" ]
         },
         "sql-tds": {
-            "description": "TDS (Sybase)",
+            "label": "TDS (Sybase)",
             "condition": "libs.tds",
             "output": [ "publicFeature" ]
         }
diff --git a/src/widgets/configure.json b/src/widgets/configure.json
index 23ee540c32..2c1f8b1e6c 100644
--- a/src/widgets/configure.json
+++ b/src/widgets/configure.json
@@ -21,7 +21,7 @@
 
     "libraries": {
         "gtk3": {
-            "description": "GTK+",
+            "label": "GTK+",
             "sources": [
                 { "type": "pkgConfig", "args": "gtk+-3.0" }
             ]
@@ -30,7 +30,7 @@
 
     "tests": {
         "uxtheme": {
-            "description": "uxtheme.h",
+            "label": "uxtheme.h",
             "type": "files",
             "files": [ "uxtheme.h" ]
         }
@@ -38,41 +38,41 @@
 
     "features": {
         "gtk3": {
-            "description": "GTK+",
+            "label": "GTK+",
             "autoDetect": "!config.darwin",
             "condition": "features.glib && libs.gtk3",
             "output": [ "privateFeature" ]
         },
         "style-fusion": {
-            "description": "Fusion Style",
+            "label": "Fusion Style",
             "output": [ "styles" ]
         },
         "style-mac": {
-            "description": "Mac Style",
+            "label": "Mac Style",
             "condition": "config.osx",
             "output": [ "styles" ]
         },
         "style-windows": {
-            "description": "Windows Style",
+            "label": "Windows Style",
             "output": [ "styles" ]
         },
         "style-windowsxp": {
-            "description": "Windows XP Style",
+            "label": "Windows XP Style",
             "condition": "features.style-windows && config.win32 && !config.winrt && tests.uxtheme",
             "output": [ "styles" ]
         },
         "style-windowsvista": {
-            "description": "Windows Vista Style",
+            "label": "Windows Vista Style",
             "condition": "features.style-windowsxp",
             "output": [ "styles" ]
         },
         "style-android": {
-            "description": "Android Style",
+            "label": "Android Style",
             "autoDetect": "config.android",
             "output": [ "styles" ]
         },
         "android-style-assets": {
-            "description": "Android Style Assets",
+            "label": "Android Style Assets",
             "condition": "features.style-android",
             "output": [ "privateConfig" ]
         }