diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-05 14:22:45 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-05 14:22:45 +0200 |
| commit | f2856875843efce9a00e90dad05bde358ab82197 (patch) | |
| tree | 93346c38504ce04f0bf02dfe4a21299feb1be8ed /src/network/kernel/qhostaddress.cpp | |
| parent | a7b04275082d065f392e7f18c54ea9b41507ae40 (diff) | |
| parent | a2970719c26c946fd6fea7d902aad6706a4ca6ea (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
examples/corelib/ipc/ipc.pro
src/plugins/platforms/xcb/qxcbbackingstore.cpp
tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp
Change-Id: Ia006e10ff1732fe78f90138c41f05b59b49486cf
Diffstat (limited to 'src/network/kernel/qhostaddress.cpp')
| -rw-r--r-- | src/network/kernel/qhostaddress.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp index 4cf412b96e..dfade24edd 100644 --- a/src/network/kernel/qhostaddress.cpp +++ b/src/network/kernel/qhostaddress.cpp @@ -1041,11 +1041,11 @@ QPair<QHostAddress, int> QHostAddress::parseSubnet(const QString &subnet) return invalid; // invalid netmask // parse the address manually - QStringList parts = netStr.split(QLatin1Char('.')); + auto parts = netStr.splitRef(QLatin1Char('.')); if (parts.isEmpty() || parts.count() > 4) return invalid; // invalid IPv4 address - if (parts.last().isEmpty()) + if (parts.constLast().isEmpty()) parts.removeLast(); quint32 addr = 0; |