diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2021-03-04 10:52:44 +0100 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2021-03-05 19:35:23 +0100 |
| commit | e4efa00c72c7011f4e5c27722c2a522b30274610 (patch) | |
| tree | 0692eb1fc7720b4d5b940d55dc69dbf3c580dd8e /src/network/ssl/qsslkey_p.h | |
| parent | d23cd35e456b31fb407ed562da173d71504733d3 (diff) | |
Fix a BIC introduced by extending the namespace QSsl in _p.h files
Renamed the private part of the namespace to QTlsPrivate.
Pick-to: dev
Fixes: QTBUG-91531
Change-Id: Id2d9c458d8d958b35e437eee42889177dad0a7a7
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/network/ssl/qsslkey_p.h')
| -rw-r--r-- | src/network/ssl/qsslkey_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/ssl/qsslkey_p.h b/src/network/ssl/qsslkey_p.h index 8afb50b421..f5895561b4 100644 --- a/src/network/ssl/qsslkey_p.h +++ b/src/network/ssl/qsslkey_p.h @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE -namespace QSsl { +namespace QTlsPrivate { class TlsKey; } @@ -71,12 +71,12 @@ public: QSslKeyPrivate(); ~QSslKeyPrivate(); - using Cipher = QSsl::Cipher; + using Cipher = QTlsPrivate::Cipher; Q_AUTOTEST_EXPORT static QByteArray decrypt(Cipher cipher, const QByteArray &data, const QByteArray &key, const QByteArray &iv); Q_AUTOTEST_EXPORT static QByteArray encrypt(Cipher cipher, const QByteArray &data, const QByteArray &key, const QByteArray &iv); - std::unique_ptr<QSsl::TlsKey> keyBackend; + std::unique_ptr<QTlsPrivate::TlsKey> backend; QAtomicInt ref; private: |