diff options
Diffstat (limited to 'src/corelib/configure.json')
| -rw-r--r-- | src/corelib/configure.json | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/src/corelib/configure.json b/src/corelib/configure.json index 66bf0dac92..60248e9cd2 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -81,11 +81,11 @@ "-ldl" ] }, - "pcre": { - "label": "PCRE", - "test": "unix/pcre", + "pcre2": { + "label": "PCRE2", + "test": "unix/pcre2", "sources": [ - "-lpcre16" + "-lpcre2-16" ] }, "pps": { @@ -308,14 +308,14 @@ "condition": "features.textcodec", "output": [ "publicFeature", "feature" ] }, - "system-pcre": { - "label": "Using system PCRE", + "system-pcre2": { + "label": "Using system PCRE2", "disable": "input.pcre == 'qt'", "enable": "input.pcre == 'system'", - "condition": "libs.pcre", + "condition": "libs.pcre2", "output": [ "privateFeature", - { "type": "privateConfig", "negative": true, "name": "pcre" } + { "type": "privateConfig", "negative": true, "name": "pcre2" } ] }, "poll_ppoll": { @@ -446,6 +446,13 @@ "condition": "!config.winrt && !config.uikit && !config.integrity && !config.vxworks", "output": [ "publicFeature", "feature" ] }, + "processenvironment": { + "label": "QProcessEnvironment", + "purpose": "Provides a higher-level abstraction of environment variables.", + "section": "File I/O", + "condition": "!config.winrt && !config.integrity", + "output": [ "publicFeature" ] + }, "temporaryfile": { "label": "QTemporaryFile", "purpose": "Provides an I/O device that operates on temporary files.", @@ -630,7 +637,7 @@ Please apply the patch corresponding to your Standard Library vendor, found in "args": "qqnx_pps", "condition": "config.qnx" }, - "system-pcre" + "system-pcre2" ] } ] |