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 /src/network | |
| parent | ffdacff6b0cf068c935e63c0238cbe509f14445c (diff) | |
| parent | f1d2c20a2754894f26e3af3d72699ce01f312799 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ic193ccc3e9e3a86e15a002d599c13f35940e1eab
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/kernel/qnetworkinterface.cpp | 2 | ||||
| -rw-r--r-- | src/network/kernel/qnetworkinterface.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/network/kernel/qnetworkinterface.cpp b/src/network/kernel/qnetworkinterface.cpp index 70674e9adf..75a26848a6 100644 --- a/src/network/kernel/qnetworkinterface.cpp +++ b/src/network/kernel/qnetworkinterface.cpp @@ -706,7 +706,7 @@ int QNetworkInterface::index() const \sa QUdpSocket */ -int QNetworkInterface::maxTransmissionUnit() const +int QNetworkInterface::maximumTransmissionUnit() const { return d ? d->mtu : 0; } diff --git a/src/network/kernel/qnetworkinterface.h b/src/network/kernel/qnetworkinterface.h index f7ef192dc0..148fd5e10d 100644 --- a/src/network/kernel/qnetworkinterface.h +++ b/src/network/kernel/qnetworkinterface.h @@ -153,7 +153,7 @@ public: bool isValid() const; int index() const; - int maxTransmissionUnit() const; + int maximumTransmissionUnit() const; QString name() const; QString humanReadableName() const; InterfaceFlags flags() const; |