diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/ssl/qsslcertificate.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h index b98c5cfcabe..147919fa3b0 100644 --- a/src/network/ssl/qsslcertificate.h +++ b/src/network/ssl/qsslcertificate.h @@ -147,18 +147,13 @@ public: QString toText() const; #if QT_DEPRECATED_SINCE(5,15) - QT_DEPRECATED_X("Use the overload not using QRegExp") static QList<QSslCertificate> fromPath( - const QString &path, QSsl::EncodingFormat format = QSsl::Pem, - QRegExp::PatternSyntax syntax = QRegExp::FixedString); - - static QList<QSslCertificate> fromPath( - const QString &path, QSsl::EncodingFormat format, - PatternSyntax syntax); -#else - static QList<QSslCertificate> fromPath( - const QString &path, QSsl::EncodingFormat format = QSsl::Pem, - PatternSyntax syntax = FixedString); + QT_DEPRECATED_X("Use the overload not using QRegExp") + static QList<QSslCertificate> fromPath(const QString &path, QSsl::EncodingFormat format, + QRegExp::PatternSyntax syntax); #endif + static QList<QSslCertificate> fromPath(const QString &path, + QSsl::EncodingFormat format = QSsl::Pem, + PatternSyntax syntax = PatternSyntax::FixedString); static QList<QSslCertificate> fromDevice( QIODevice *device, QSsl::EncodingFormat format = QSsl::Pem); |