diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-28 11:51:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-28 11:51:35 +0200 |
| commit | e918334045612ec2c7c6203845ad05c4a1972e87 (patch) | |
| tree | b59bf3a173c6bfa58c3ba9b5bb80df4a093247dc /src/network/kernel | |
| parent | e3cbf0f1962958457f6e09fcfdc92d8cac4b6511 (diff) | |
| parent | cf0119bb69592d58ca7e6a75753799ebae61e4b5 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/widgets/dialogs/qcolordialog.cpp
src/widgets/dialogs/qfiledialog.cpp
tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
Change-Id: I34bc8a990f8f526889a95a5c7099ef557b9681ad
Diffstat (limited to 'src/network/kernel')
| -rw-r--r-- | src/network/kernel/qnetworkinterface_unix.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/network/kernel/qnetworkinterface_unix.cpp b/src/network/kernel/qnetworkinterface_unix.cpp index da53ccfe70..53813c7f9c 100644 --- a/src/network/kernel/qnetworkinterface_unix.cpp +++ b/src/network/kernel/qnetworkinterface_unix.cpp @@ -404,6 +404,9 @@ static QList<QNetworkInterfacePrivate *> createInterfaces(ifaddrs *rawList) if (seenIndexes.contains(ifindex)) continue; + seenInterfaces.insert(name); + seenIndexes.append(ifindex); + QNetworkInterfacePrivate *iface = new QNetworkInterfacePrivate; interfaces << iface; iface->name = name; |