diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-12 01:00:09 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-12 01:00:09 +0100 |
commit | 6dc1a52b4a3341e5474eab128161212f6d952513 (patch) | |
tree | 2e8714840ab31f48f279a230c6a01e88d979c7bd /tests | |
parent | ffdacff6b0cf068c935e63c0238cbe509f14445c (diff) | |
parent | f1d2c20a2754894f26e3af3d72699ce01f312799 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ic193ccc3e9e3a86e15a002d599c13f35940e1eab
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp index 0b4ed4870d..b73ed8eaec 100644 --- a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp +++ b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp @@ -143,7 +143,7 @@ void tst_QNetworkInterface::dump() qDebug() << " flags: " << qPrintable(flags); qDebug() << " type: " << i.type(); qDebug() << " hw address:" << qPrintable(i.hardwareAddress()); - qDebug() << " MTU: " << i.maxTransmissionUnit(); + qDebug() << " MTU: " << i.maximumTransmissionUnit(); int count = 0; foreach (const QNetworkAddressEntry &e, i.addressEntries()) { @@ -187,7 +187,7 @@ void tst_QNetworkInterface::consistencyCheck() if (iface.index()) interfaceIndexes << iface.index(); - QVERIFY(iface.maxTransmissionUnit() >= 0); + QVERIFY(iface.maximumTransmissionUnit() >= 0); const QList<QNetworkAddressEntry> addresses = iface.addressEntries(); for (auto entry : addresses) { @@ -275,7 +275,7 @@ void tst_QNetworkInterface::localAddress() << "pmtu" << pmtu; // check that the Path MTU is less than or equal the interface's MTU - QVERIFY(pmtu <= outgoingIface->maxTransmissionUnit()); + QVERIFY(pmtu <= outgoingIface->maximumTransmissionUnit()); } void tst_QNetworkInterface::interfaceFromXXX_data() |