diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-07-22 14:23:20 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-07-28 12:38:15 +0200 |
| commit | 1482739002f7dfca398ddc850c0bc1e0f4893ddd (patch) | |
| tree | 9623404364027482ca5460e1d3caf9af4e095420 /tests/auto/network | |
| parent | 83f00b82298cf8fbba8baa7b983ff177f74a6642 (diff) | |
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>
Diffstat (limited to 'tests/auto/network')
| -rw-r--r-- | tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp b/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp index ad8c4a8d1c..6bfd40a580 100644 --- a/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp +++ b/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp @@ -364,23 +364,9 @@ void tst_QHostAddress::isEqual() QCOMPARE(second.isEqual(first, QHostAddress::ConversionModeFlag(flags)), result); } -QT_WARNING_PUSH -#ifdef QT_WARNING_DISABLE_DEPRECATED -QT_WARNING_DISABLE_DEPRECATED -#endif - void tst_QHostAddress::assignment() { QHostAddress address; - -#if QT_DEPRECATED_SINCE(5, 8) - address = "127.0.0.1"; - QCOMPARE(address, QHostAddress("127.0.0.1")); - - address = "::1"; - QCOMPARE(address, QHostAddress("::1")); -#endif - QHostAddress addr("4.2.2.1"); sockaddr_in sockAddr; sockAddr.sin_family = AF_INET; @@ -389,8 +375,6 @@ void tst_QHostAddress::assignment() QCOMPARE(address, addr); } -QT_WARNING_POP - void tst_QHostAddress::scopeId() { QHostAddress address("fe80::2e0:4cff:fefb:662a%eth0"); |