From 8b086b49b48e7c69413ce08aa534378e54633fe4 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 9 Nov 2020 14:10:29 +0100 Subject: [PATCH] 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 --- src/corelib/.prev_configure.cmake | 4 ++-- src/corelib/configure.cmake | 4 ++-- 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 40cbaa7ec89..1218f552cb6 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 1288666a3da..095b12ea968 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 27fff51a0fc..5e0bd51ec9b 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": {