diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2021-03-04 10:52:44 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-03-05 20:50:02 +0000 |
| commit | 734ab493f7c05e06f4c8bc99884d8a99612c79c0 (patch) | |
| tree | 905709f426c77176f4d057f0dace372ec1cb3767 /src/network/ssl/qx509_openssl_p.h | |
| parent | 7402f4171d91f2dcd33fb14d4ee4a7665dc7e66e (diff) | |
Fix a BIC introduced by extending the namespace QSsl in _p.h files
Renamed the private part of the namespace to QTlsPrivate.
Fixes: QTBUG-91531
Change-Id: Id2d9c458d8d958b35e437eee42889177dad0a7a7
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit e4efa00c72c7011f4e5c27722c2a522b30274610)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/network/ssl/qx509_openssl_p.h')
| -rw-r--r-- | src/network/ssl/qx509_openssl_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/ssl/qx509_openssl_p.h b/src/network/ssl/qx509_openssl_p.h index 92752e5f48..ad5786d5e3 100644 --- a/src/network/ssl/qx509_openssl_p.h +++ b/src/network/ssl/qx509_openssl_p.h @@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE -namespace QSsl { +namespace QTlsPrivate { // TLSTODO: This class is essentially what qsslcertificate_openssl.cpp // contains - OpenSSL-based version of QSslCertificatePrivate. Remove @@ -127,7 +127,7 @@ private: extern "C" int qt_X509Callback(int ok, X509_STORE_CTX *ctx); -} // namespace QSsl. +} // namespace QTlsPrivate QT_END_NAMESPACE |