From 97043dd2066abfb64f32b24f697c2f338d7842c8 Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Wed, 30 Apr 2025 17:28:05 +0300 Subject: [PATCH] QSslCertificate: fix PatternSyntax enum value Regexp was renamed to RegularExpression. Amends 813111689629a71e51d7d149a5f689b2961f2716. This looks like a "dead" code path, QT_FEATURE_regularexpression is most likely always enabled. Pick-to: 6.8 6.5 5.15 Change-Id: I99af481bb41a197a0b7d00c750440a93d8e6a3fe Reviewed-by: Ivan Solovev (cherry picked from commit 6952cfe7a0a0a23997189b73cd08e8871afeb2ea) Reviewed-by: Qt Cherry-pick Bot --- src/network/ssl/qsslcertificate.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp index 63a373c4971..af3e47f66f9 100644 --- a/src/network/ssl/qsslcertificate.cpp +++ b/src/network/ssl/qsslcertificate.cpp @@ -650,7 +650,7 @@ QList QSslCertificate::fromPath(const QString &path, else if (syntax == PatternSyntax::RegularExpression) pos = sourcePath.indexOf(QRegularExpression("[\\$\\(\\)\\*\\+\\.\\?\\[\\]\\^\\{\\}\\|]"_L1)); #else - if (syntax == PatternSyntax::Wildcard || syntax == PatternSyntax::RegExp) + if (syntax == PatternSyntax::Wildcard || syntax == PatternSyntax::RegularExpression) qWarning("Regular expression support is disabled in this build. Only fixed string can be searched"); return QList(); #endif