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

Restore configure command line compatibility for PCRE support

Browse Source 
Commit 9ca635482d renamed the configure
feature from pcre to pcre2, which unfortunately means that people would
have to change their build scripts to pass -qt-pcre2 instead of
-qt-pcre. As the configure check already verifies the correct PCRE
version for use (when using the system library), it seems more
convenient for our users to retain compatibility and call the configure
feature "pcre" again.

Change-Id: If26e7888814d8204d43baf7298d9916a4f856a48
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Simon Hausmann 2017-01-03 13:14:14 +01:00
parent a670f06390
commit 47c4d1378c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config_help.txt
View File

@ -206,7 +206,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]
-pcre2 ............... Select used libpcre2 [system/qt] -pcre ................ Select used libpcre2 [system/qt]
-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]
ZLIB_LIBS= ZLIB_LIBS=

6
src/corelib/configure.json
View File

@ -11,7 +11,7 @@
"icu": "boolean", "icu": "boolean",
"inotify": "boolean", "inotify": "boolean",
"journald": "boolean", "journald": "boolean",
"pcre2": { "type": "enum", "values": [ "qt", "system" ] }, "pcre": { "type": "enum", "values": [ "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",
@ -309,8 +309,8 @@
}, },
"system-pcre2": { "system-pcre2": {
"label": "Using system PCRE2", "label": "Using system PCRE2",
"disable": "input.pcre2 == 'qt'", "disable": "input.pcre == 'qt'",
"enable": "input.pcre2 == 'system'", "enable": "input.pcre == 'system'",
"condition": "libs.pcre2", "condition": "libs.pcre2",
"output": [ "output": [
"privateFeature", "privateFeature",