diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-09 14:10:29 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-09 16:01:33 +0100 |
| commit | 8b086b49b48e7c69413ce08aa534378e54633fe4 (patch) | |
| tree | 11363c0edb435bf4b5caaba82990c0b8eea41078 /src | |
| parent | 2572a0d43044a082cfb5315c879a7263f5018237 (diff) | |
Fix pcre2 feature conditions
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/.prev_configure.cmake | 4 | ||||
| -rw-r--r-- | src/corelib/configure.cmake | 4 | ||||
| -rw-r--r-- | src/corelib/configure.json | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/.prev_configure.cmake b/src/corelib/.prev_configure.cmake index 40cbaa7ec8..1218f552cb 100644 --- a/src/corelib/.prev_configure.cmake +++ b/src/corelib/.prev_configure.cmake @@ -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 diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index 1288666a3d..095b12ea96 100644 --- a/src/corelib/configure.cmake +++ b/src/corelib/configure.cmake @@ -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 diff --git a/src/corelib/configure.json b/src/corelib/configure.json index 27fff51a0f..5e0bd51ec9 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -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": { |