diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-03-13 00:06:16 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-03-15 11:35:43 +0100 |
| commit | 45b7af038f87015bb00660af7b71c28ce6af4fd8 (patch) | |
| tree | 8e8e4fa26a6d9a361b478e07fe064ee0ec8aa62f /src/network/kernel/qnetworkinterface.h | |
| parent | a5573cfbd5f9bd5ac020b05c73e9da2cd7c0c33a (diff) | |
Port from QScopedPointer to std::unique_ptr
Silence compiler warnings from deprecated QScopedPointer::swap after
fe9d7bf759d116f99131d14ac8b1fb44b2bc62fd.
For Qt 7, both QSslCipher and QNetworkAddressEntry should be made into
implicitly shared classes.
Change-Id: Idfd5ec4b5a0f156f212d57684822a3cd1d88de1a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/network/kernel/qnetworkinterface.h')
| -rw-r--r-- | src/network/kernel/qnetworkinterface.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/network/kernel/qnetworkinterface.h b/src/network/kernel/qnetworkinterface.h index c65ea58860..b96ca0e5fa 100644 --- a/src/network/kernel/qnetworkinterface.h +++ b/src/network/kernel/qnetworkinterface.h @@ -45,6 +45,8 @@ #include <QtCore/qscopedpointer.h> #include <QtNetwork/qhostaddress.h> +#include <memory> + #ifndef QT_NO_NETWORKINTERFACE QT_BEGIN_NAMESPACE @@ -96,7 +98,8 @@ public: bool isTemporary() const { return !isPermanent(); } private: - QScopedPointer<QNetworkAddressEntryPrivate> d; + // ### Qt 7: make implicitly shared + std::unique_ptr<QNetworkAddressEntryPrivate> d; }; Q_DECLARE_SHARED(QNetworkAddressEntry) |