1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QSslCertificate: fix PatternSyntax enum value

Browse Source 
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 <ivan.solovev@qt.io>
(cherry picked from commit 6952cfe7a0a0a23997189b73cd08e8871afeb2ea)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Ahmad Samir 2025-04-30 17:28:05 +03:00 committed by Qt Cherry-pick Bot
parent 23d3d83061
commit 97043dd206
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/ssl/qsslcertificate.cpp
View File

@ -650,7 +650,7 @@ QList<QSslCertificate> 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<QSslCertificate>();
#endif