diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-09-23 14:56:06 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-09-28 15:48:49 +0200 |
| commit | 673da7d4607cd5597b3c58f8c118459efdcaaeb3 (patch) | |
| tree | c10a6285935fce352308a03781a5eeec51884dbc /src | |
| parent | a6e1f67937c280961f7ec23b2a002ca7d057761d (diff) | |
QSslConfiguration::setAllowedNextProtocol - remove the old signature
Change-Id: I0b4b18e6ea2b78917220e77865fd92eb7a684179
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/ssl/qsslconfiguration.cpp | 4 | ||||
| -rw-r--r-- | src/network/ssl/qsslconfiguration.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp index 2ba35572cf..4b41d84633 100644 --- a/src/network/ssl/qsslconfiguration.cpp +++ b/src/network/ssl/qsslconfiguration.cpp @@ -1063,11 +1063,7 @@ QByteArray QSslConfiguration::nextNegotiatedProtocol() const \sa nextNegotiatedProtocol(), nextProtocolNegotiationStatus(), allowedNextProtocols(), QSslConfiguration::NextProtocolHttp1_1 */ -#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) void QSslConfiguration::setAllowedNextProtocols(const QList<QByteArray> &protocols) -#else -void QSslConfiguration::setAllowedNextProtocols(QList<QByteArray> protocols) -#endif { d->nextAllowedProtocols = protocols; } diff --git a/src/network/ssl/qsslconfiguration.h b/src/network/ssl/qsslconfiguration.h index 706ac5775f..116920950e 100644 --- a/src/network/ssl/qsslconfiguration.h +++ b/src/network/ssl/qsslconfiguration.h @@ -189,11 +189,7 @@ public: NextProtocolNegotiationUnsupported }; -#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) void setAllowedNextProtocols(const QList<QByteArray> &protocols); -#else - void setAllowedNextProtocols(QList<QByteArray> protocols); -#endif QList<QByteArray> allowedNextProtocols() const; QByteArray nextNegotiatedProtocol() const; |