whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Lars Knoll 2020-03-18 12:31:39 +01:00
parent fd72ed794d
commit 5eb492fb95
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/network/ssl/qsslcertificate.h
View File

@ -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);