diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-17 10:53:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-17 10:53:42 +0200 |
| commit | 3cb56800d581dabd18e354a24f018c55bd91f748 (patch) | |
| tree | 9b8e95cf62e22026463a0f87a3625b279f457aad /src/network/kernel/qnetworkproxy_win.cpp | |
| parent | aed7540d45096791d1a824f500694a15426fd94b (diff) | |
| parent | 3d8c8daae109fbd6d60e43c3d4457b581e5e62a3 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
Change-Id: If899cda251b4dc8b8a7c6764520e88ab719737cd
Diffstat (limited to 'src/network/kernel/qnetworkproxy_win.cpp')
| -rw-r--r-- | src/network/kernel/qnetworkproxy_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/kernel/qnetworkproxy_win.cpp b/src/network/kernel/qnetworkproxy_win.cpp index 03109b4e46..2727bd9257 100644 --- a/src/network/kernel/qnetworkproxy_win.cpp +++ b/src/network/kernel/qnetworkproxy_win.cpp @@ -320,7 +320,7 @@ static QList<QNetworkProxy> parseServerList(const QNetworkProxyQuery &query, con pos = entry.indexOf(QLatin1Char(':'), server); if (pos != -1) { bool ok; - uint value = entry.mid(pos + 1).toUInt(&ok); + uint value = entry.midRef(pos + 1).toUInt(&ok); if (!ok || value > 65535) continue; // invalid port number |