From 5eb492fb9563cad4879bb77a3a5ba24e2d2109a5 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 18 Mar 2020 12:31:39 +0100 Subject: [PATCH] Move the default arguments of fromPath away from the deprecated overload MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/network/ssl/qsslcertificate.h | 17 ++++++----------- 1 file 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 fromPath( - const QString &path, QSsl::EncodingFormat format = QSsl::Pem, - QRegExp::PatternSyntax syntax = QRegExp::FixedString); - - static QList fromPath( - const QString &path, QSsl::EncodingFormat format, - PatternSyntax syntax); -#else - static QList fromPath( - const QString &path, QSsl::EncodingFormat format = QSsl::Pem, - PatternSyntax syntax = FixedString); + QT_DEPRECATED_X("Use the overload not using QRegExp") + static QList fromPath(const QString &path, QSsl::EncodingFormat format, + QRegExp::PatternSyntax syntax); #endif + static QList fromPath(const QString &path, + QSsl::EncodingFormat format = QSsl::Pem, + PatternSyntax syntax = PatternSyntax::FixedString); static QList fromDevice( QIODevice *device, QSsl::EncodingFormat format = QSsl::Pem);