diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-03-18 12:31:39 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-03-19 09:27:18 +0100 |
| commit | 5eb492fb9563cad4879bb77a3a5ba24e2d2109a5 (patch) | |
| tree | c61834dec978ffa9222aaf9a7b0e4bee5ab031ef /src/network | |
| parent | fd72ed794d0325e122cd42cf3c2d0e4874b7b929 (diff) | |
Move the default arguments of fromPath away from the deprecated overload
Move the default arguments to the overload that is not deprecated. This
is fully source and binary compatible.
Change-Id: I0d2eb491faf8c2164b80c33c4c4f749173b690f5
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/network')
| -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 b98c5cfcab..147919fa3b 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); |