QHostAddress: resolve API issues marked with ##Qt6

Also, remove the deprecated function and its auto-test.

Change-Id: If04a54c4b91e0f76523960c7b1a5bcb8fe883ac6
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 1 insertions, 8 deletions

diff --git a/src/network/kernel/qhostaddress.h b/src/network/kernel/qhostaddress.h
index 6f83bdef05..82790fa28d 100644
--- a/src/network/kernel/qhostaddress.h
+++ b/src/network/kernel/qhostaddress.h
@@ -93,7 +93,6 @@ public:
 
     QHostAddress();
     explicit QHostAddress(quint32 ip4Addr);
-    explicit QHostAddress(quint8 *ip6Addr); // ### Qt 6: remove me
     explicit QHostAddress(const quint8 *ip6Addr);
     explicit QHostAddress(const Q_IPV6ADDR &ip6Addr);
     explicit QHostAddress(const sockaddr *address);
@@ -105,16 +104,11 @@ public:
     QHostAddress &operator=(QHostAddress &&other) noexcept
     { swap(other); return *this; }
     QHostAddress &operator=(const QHostAddress &other);
-#if QT_DEPRECATED_SINCE(5, 8)
-    QT_DEPRECATED_X("use = QHostAddress(string) instead")
-    QHostAddress &operator=(const QString &address);
-#endif
     QHostAddress &operator=(SpecialAddress address);
 
     void swap(QHostAddress &other) noexcept { d.swap(other.d); }
 
     void setAddress(quint32 ip4Addr);
-    void setAddress(quint8 *ip6Addr);   // ### Qt 6: remove me
     void setAddress(const quint8 *ip6Addr);
     void setAddress(const Q_IPV6ADDR &ip6Addr);
     void setAddress(const sockaddr *address);
@@ -122,8 +116,7 @@ public:
     void setAddress(SpecialAddress address);
 
     QAbstractSocket::NetworkLayerProtocol protocol() const;
-    quint32 toIPv4Address() const; // ### Qt6: merge with next overload
-    quint32 toIPv4Address(bool *ok) const;
+    quint32 toIPv4Address(bool *ok = nullptr) const;
     Q_IPV6ADDR toIPv6Address() const;
 
     QString toString() const;