summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2020-11-09 14:10:29 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2020-11-10 13:29:42 +0000
commita3914e468d3bb9ef70862a0d81cb4fbb69c934cd (patch)
tree2a092044e4e96772f3e9d0454cba14dd05f9850b
parent1689fe2b810304161a8449d36b6dfb845c90eb09 (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 Change-Id: I4edee49a9c797797ef3b80f955b48b5492fb4fc7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 8b086b49b48e7c69413ce08aa534378e54633fe4)
-rw-r--r--src/corelib/configure.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/configure.json b/src/corelib/configure.json
index c5e0423273..9b5d19d41b 100644
--- a/src/corelib/configure.json
+++ b/src/corelib/configure.json
@@ -727,8 +727,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": {