diff options
Diffstat (limited to 'src/network/ssl/qsslcertificate.h')
| -rw-r--r-- | src/network/ssl/qsslcertificate.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h index 147919fa3b..4d3f7d8ddb 100644 --- a/src/network/ssl/qsslcertificate.h +++ b/src/network/ssl/qsslcertificate.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -50,7 +50,6 @@ #include <QtCore/qbytearray.h> #include <QtCore/qcryptographichash.h> #include <QtCore/qdatetime.h> -#include <QtCore/qregexp.h> #include <QtCore/qsharedpointer.h> #include <QtCore/qmap.h> #include <QtNetwork/qssl.h> @@ -130,10 +129,6 @@ public: QList<QByteArray> subjectInfoAttributes() const; QList<QByteArray> issuerInfoAttributes() const; -#if QT_DEPRECATED_SINCE(5,0) - QT_DEPRECATED inline QMultiMap<QSsl::AlternateNameEntryType, QString> - alternateSubjectNames() const { return subjectAlternativeNames(); } -#endif QMultiMap<QSsl::AlternativeNameEntryType, QString> subjectAlternativeNames() const; QDateTime effectiveDate() const; QDateTime expiryDate() const; @@ -146,11 +141,6 @@ public: QByteArray toDer() const; 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, - QRegExp::PatternSyntax syntax); -#endif static QList<QSslCertificate> fromPath(const QString &path, QSsl::EncodingFormat format = QSsl::Pem, PatternSyntax syntax = PatternSyntax::FixedString); |