Deprecate FEATURE_regularexpression
There have been places where regex support has been implied and bootstrap always builds with regex enabled. Therefore, disabling `FEATURE_regularexpression` currently produces an error. Until a need for building without regex emerges, we are enforcing it as a requirement. Users must either use system or bundled pcre2. Fixes: QTBUG-136346 Change-Id: I9e92bb4e7f0dfb84884a2a23f45b20d18ddc8985 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
parent
618053e279
commit
295b3ca5bd
@ -919,11 +919,12 @@ qt_feature("vxpipedrv" PRIVATE
|
||||
AUTODETECT OFF
|
||||
CONDITION VXWORKS
|
||||
)
|
||||
qt_feature("regularexpression" PUBLIC
|
||||
qt_feature_deprecated("regularexpression" PUBLIC
|
||||
REMOVE_BY "7.0"
|
||||
SECTION "Kernel"
|
||||
LABEL "QRegularExpression"
|
||||
PURPOSE "Provides an API to Perl-compatible regular expressions."
|
||||
CONDITION QT_FEATURE_system_pcre2 OR QT_FEATURE_pcre2
|
||||
VALUE ON
|
||||
)
|
||||
qt_feature_definition("regularexpression" "QT_NO_REGULAREXPRESSION" NEGATE VALUE "1")
|
||||
qt_feature("backtrace" PRIVATE
|
||||
@ -1275,3 +1276,8 @@ qt_configure_add_report_entry(
|
||||
MESSAGE "Basic cpp/winrt support missing. Some features might not be available."
|
||||
CONDITION WIN32 AND NOT QT_FEATURE_cpp_winrt
|
||||
)
|
||||
qt_configure_add_report_entry(
|
||||
TYPE ERROR
|
||||
MESSAGE "Qt requires pcre2 or system-pcre2 feature"
|
||||
CONDITION NOT QT_FEATURE_pcre2 AND NOT QT_FEATURE_system_pcre2
|
||||
)
|
||||
|
Loading…
x
Reference in New Issue
Block a user