diff options
| author | Mikhail Svetkin <mikhail.svetkin@qt.io> | 2019-01-04 16:26:19 +0100 |
|---|---|---|
| committer | Mikhail Svetkin <mikhail.svetkin@qt.io> | 2019-02-22 14:04:54 +0000 |
| commit | 0f431712fbcb3775d85891a97ccb080d0da581e0 (patch) | |
| tree | ee40ff0200d334d26c525613d715167850fa1e65 /src/corelib/configure.json | |
| parent | 46589056c399191e1afe0b2ddb1e2f0570fa8ddc (diff) | |
qtlite: Add a new option -no-pcre
pcre only used by QRegularExpression.
Change-Id: I704bdb46ed8956f875e1f5fcc0fa2e06122fd87e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/configure.json')
| -rw-r--r-- | src/corelib/configure.json | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/corelib/configure.json b/src/corelib/configure.json index 948aa0829b..81768507f6 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -11,7 +11,7 @@ "icu": "boolean", "inotify": "boolean", "journald": "boolean", - "pcre": { "type": "enum", "values": [ "qt", "system" ] }, + "pcre": { "type": "enum", "values": [ "no", "qt", "system" ] }, "posix-ipc": { "type": "boolean", "name": "ipc_posix" }, "pps": { "type": "boolean", "name": "qqnx_pps" }, "slog2": "boolean", @@ -662,15 +662,18 @@ "condition": "features.textcodec", "output": [ "publicFeature", "feature" ] }, + "pcre2": { + "label": "PCRE2", + "disable": "input.pcre == 'no' || input.pcre == 'system'", + "enable": "input.pcre == 'qt'", + "output": [ "privateConfig" ] + }, "system-pcre2": { - "label": "Using system PCRE2", - "disable": "input.pcre == 'qt'", + "label": " Using system PCRE2", + "disable": "input.pcre == 'no' || input.pcre == 'qt'", "enable": "input.pcre == 'system'", "condition": "libs.pcre2", - "output": [ - "privateFeature", - { "type": "privateConfig", "negative": true, "name": "pcre2" } - ] + "output": [ "privateFeature" ] }, "poll_ppoll": { "label": "Native ppoll()", @@ -749,6 +752,7 @@ "label": "QRegularExpression", "purpose": "Provides an API to Perl-compatible regular expressions.", "section": "Kernel", + "condition": "features.system-pcre2 || features.pcre2", "output": [ "publicFeature", "feature" ] }, "sharedmemory": { @@ -1048,6 +1052,7 @@ Please apply the patch corresponding to your Standard Library vendor, found in "args": "qqnx_pps", "condition": "config.qnx" }, + "pcre2", "system-pcre2" ] } |