diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-26 16:08:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-26 16:14:54 +0200 |
| commit | aadfe7d634de04519102c5827ca885dc2e2199c9 (patch) | |
| tree | d92db346ca95332b177036a53f1f6beb2e24fb74 /src/network/kernel/qnetworkinterface.cpp | |
| parent | 4b6c1448047362b8c38d265e6414f0e3e59b8d37 (diff) | |
| parent | a732e16d5fd9dbf8a0289fec9f948b12e9ba2c19 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/gui/kernel/qguiapplication.cpp
src/platformsupport/input/libinput/qlibinputpointer.cpp
src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
src/plugins/platforms/cocoa/qcocoawindow.h
src/testlib/qtestsystem.h
Change-Id: I5975ffb3261c2dd82fe02ec4e57df7c0950226c5
Diffstat (limited to 'src/network/kernel/qnetworkinterface.cpp')
| -rw-r--r-- | src/network/kernel/qnetworkinterface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/kernel/qnetworkinterface.cpp b/src/network/kernel/qnetworkinterface.cpp index c5d1adbef0..2c28ae9ed9 100644 --- a/src/network/kernel/qnetworkinterface.cpp +++ b/src/network/kernel/qnetworkinterface.cpp @@ -257,7 +257,7 @@ void QNetworkAddressEntry::setIp(const QHostAddress &newIp) */ QHostAddress QNetworkAddressEntry::netmask() const { - return d->netmask; + return d->netmask.address(d->address.protocol()); } /*! @@ -270,7 +270,7 @@ QHostAddress QNetworkAddressEntry::netmask() const void QNetworkAddressEntry::setNetmask(const QHostAddress &newNetmask) { if (newNetmask.protocol() != ip().protocol()) { - d->netmask = QNetmaskAddress(); + d->netmask = QNetmask(); return; } |