diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-03-31 12:39:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-03-31 12:39:42 +0200 |
| commit | 29f01b32f58573b23bd35857376f6f92e15382a3 (patch) | |
| tree | b1a044f87e4b18d5ddd779dc1b63161ded1c3d1a /src/corelib/configure.json | |
| parent | 300940a6c9eb0f74cefda7d76a5d19f56ec50253 (diff) | |
| parent | 0a7302abbc47a0db25f119ee4f5144bbaf0d9d6f (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/corelib/configure.json
Change-Id: I93ac67f3bf4844bc7c691183e94bceb922b7b919
Diffstat (limited to 'src/corelib/configure.json')
| -rw-r--r-- | src/corelib/configure.json | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/src/corelib/configure.json b/src/corelib/configure.json index 81768507f6..a6091d4825 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -11,6 +11,7 @@ "icu": "boolean", "inotify": "boolean", "journald": "boolean", + "mimetype-database": "boolean", "pcre": { "type": "enum", "values": [ "no", "qt", "system" ] }, "posix-ipc": { "type": "boolean", "name": "ipc_posix" }, "pps": { "type": "boolean", "name": "qqnx_pps" }, @@ -374,6 +375,16 @@ ] } }, + "glibc": { + "label": "GNU libc", + "type": "compile", + "test": { + "include": "stdlib.h", + "main": [ + "return __GLIBC__;" + ] + } + }, "inotify": { "label": "inotify", "type": "compile", @@ -593,6 +604,12 @@ "condition": "libs.glib", "output": [ "privateFeature", "feature" ] }, + "glibc": { + "label": "GNU libc", + "autoDetect": "config.linux", + "condition": "tests.glibc", + "output": [ "privateFeature" ] + }, "iconv": { "label": "iconv", "purpose": "Provides internationalization on Unix.", @@ -662,6 +679,11 @@ "condition": "features.textcodec", "output": [ "publicFeature", "feature" ] }, + "mimetype-database": { + "label": "Built-in copy of the MIME database", + "condition": "features.mimetype", + "output": [ "privateFeature" ] + }, "pcre2": { "label": "PCRE2", "disable": "input.pcre == 'no' || input.pcre == 'system'", @@ -1036,6 +1058,7 @@ Please apply the patch corresponding to your Standard Library vendor, found in "glib", "iconv", "icu", + "mimetype-database", { "message": "Tracing backend", "type": "firstAvailableFeature", |