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

Fix pcre2 feature conditions

Browse Source 
The pcre2 feature was turned off when the user passed -system-pcre to
configure. The reason were faulty expressions in the enable/disable
fields.

Fixes: QTBUG-88295
Pick-to: 5.15
Change-Id: I4edee49a9c797797ef3b80f955b48b5492fb4fc7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2020-11-09 14:10:29 +01:00
parent 2572a0d430
commit 8b086b49b4
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/.prev_configure.cmake
View File

@ -637,8 +637,8 @@ qt_feature("mimetype-database" PRIVATE
)
qt_feature("pcre2"
LABEL "PCRE2"
ENABLE INPUT_pcre STREQUAL 'qt'
DISABLE INPUT_pcre STREQUAL 'no' OR INPUT_pcre STREQUAL 'system'
ENABLE INPUT_pcre STREQUAL 'qt' OR QT_FEATURE_system_pcre2
DISABLE INPUT_pcre STREQUAL 'no'
)
qt_feature_config("pcre2" QMAKE_PRIVATE_CONFIG)
qt_feature("system-pcre2" PRIVATE

4
src/corelib/configure.cmake
View File

@ -643,8 +643,8 @@ qt_feature("mimetype-database" PRIVATE
)
qt_feature("pcre2"
LABEL "PCRE2"
ENABLE INPUT_pcre STREQUAL 'qt'
DISABLE INPUT_pcre STREQUAL 'no' OR INPUT_pcre STREQUAL 'system'
ENABLE INPUT_pcre STREQUAL 'qt' OR QT_FEATURE_system_pcre2
DISABLE INPUT_pcre STREQUAL 'no'
)
qt_feature_config("pcre2" QMAKE_PRIVATE_CONFIG)
qt_feature("system-pcre2" PRIVATE

4
src/corelib/configure.json
View File

@ -691,8 +691,8 @@
},
"pcre2": {
"label": "PCRE2",
"disable": "input.pcre == 'no' || input.pcre == 'system'",
"enable": "input.pcre == 'qt'",
"disable": "input.pcre == 'no'",
"enable": "input.pcre == 'qt' || features.system-pcre2",
"output": [ "privateConfig" ]
},
"system-pcre2": {