diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-29 00:38:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-29 00:38:01 +0200 |
| commit | cdb56c42fc1145ad25560720fb95df2bfa760a20 (patch) | |
| tree | 4dbe524a511b9343464e8509bd5352715aebdfa9 /src/network/kernel | |
| parent | 87583738f960e83918da3b66e455e75c144fbf8e (diff) | |
| parent | e918334045612ec2c7c6203845ad05c4a1972e87 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
mkspecs/features/uikit/xcodebuild.mk
tests/auto/other/lancelot/tst_lancelot.cpp
tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
Change-Id: Ia0ae2de86094120281abd445138877c2cc3e882c
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 2fa98c0e07..4f4615d4d0 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; |