AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qtlite: Add a new option -no-pcre

Browse Source 
pcre only used by QRegularExpression.

Change-Id: I704bdb46ed8956f875e1f5fcc0fa2e06122fd87e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Mikhail Svetkin 2019-01-04 16:26:19 +01:00
parent 46589056c3
commit 0f431712fb
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config_help.txt
View File

@ -241,7 +241,7 @@ Core options:
-inotify ............. Enable inotify support -inotify ............. Enable inotify support
-iconv ............... Enable iconv(3) support [posix/sun/gnu/no] (Unix only) -iconv ............... Enable iconv(3) support [posix/sun/gnu/no] (Unix only)
-icu ................. Enable ICU support [auto] -icu ................. Enable ICU support [auto]
-pcre ................ Select used libpcre2 [system/qt] -pcre ................ Select used libpcre2 [system/qt/no]
-pps ................. Enable PPS support [auto] (QNX only) -pps ................. Enable PPS support [auto] (QNX only)
-zlib ................ Select used zlib [system/qt] -zlib ................ Select used zlib [system/qt]

19
src/corelib/configure.json
View File

@ -11,7 +11,7 @@
"icu": "boolean", "icu": "boolean",
"inotify": "boolean", "inotify": "boolean",
"journald": "boolean", "journald": "boolean",
"pcre": { "type": "enum", "values": [ "qt", "system" ] }, "pcre": { "type": "enum", "values": [ "no", "qt", "system" ] },
"posix-ipc": { "type": "boolean", "name": "ipc_posix" }, "posix-ipc": { "type": "boolean", "name": "ipc_posix" },
"pps": { "type": "boolean", "name": "qqnx_pps" }, "pps": { "type": "boolean", "name": "qqnx_pps" },
"slog2": "boolean", "slog2": "boolean",
@ -662,15 +662,18 @@
"condition": "features.textcodec", "condition": "features.textcodec",
"output": [ "publicFeature", "feature" ] "output": [ "publicFeature", "feature" ]
}, },
"pcre2": {
"label": "PCRE2",
"disable": "input.pcre == 'no' || input.pcre == 'system'",
"enable": "input.pcre == 'qt'",
"output": [ "privateConfig" ]
},
"system-pcre2": { "system-pcre2": {
"label": "Using system PCRE2", "label": " Using system PCRE2",
"disable": "input.pcre == 'qt'", "disable": "input.pcre == 'no' || input.pcre == 'qt'",
"enable": "input.pcre == 'system'", "enable": "input.pcre == 'system'",
"condition": "libs.pcre2", "condition": "libs.pcre2",
"output": [ "output": [ "privateFeature" ]
"privateFeature",
{ "type": "privateConfig", "negative": true, "name": "pcre2" }
]
}, },
"poll_ppoll": { "poll_ppoll": {
"label": "Native ppoll()", "label": "Native ppoll()",
@ -749,6 +752,7 @@
"label": "QRegularExpression", "label": "QRegularExpression",
"purpose": "Provides an API to Perl-compatible regular expressions.", "purpose": "Provides an API to Perl-compatible regular expressions.",
"section": "Kernel", "section": "Kernel",
"condition": "features.system-pcre2 || features.pcre2",
"output": [ "publicFeature", "feature" ] "output": [ "publicFeature", "feature" ]
}, },
"sharedmemory": { "sharedmemory": {
@ -1048,6 +1052,7 @@ Please apply the patch corresponding to your Standard Library vendor, found in
"args": "qqnx_pps", "args": "qqnx_pps",
"condition": "config.qnx" "condition": "config.qnx"
}, },
"pcre2",
"system-pcre2" "system-pcre2"
] ]
} }