Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: Ie709286a14b452dae7abb59830f584bb33f1ccf5

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
index 2c038efdec..13d8a21794 100644
--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
@@ -492,11 +492,11 @@ void tst_QTcpSocket::bind_data()
 
     // iterate all interfaces, add all addresses on them as test data
     QList<QNetworkInterface> interfaces = QNetworkInterface::allInterfaces();
-    foreach (const QNetworkInterface &interface, interfaces) {
-        if (!interface.isValid())
+    foreach (const QNetworkInterface &netinterface, interfaces) {
+        if (!netinterface.isValid())
             continue;
 
-        foreach (const QNetworkAddressEntry &entry, interface.addressEntries()) {
+        foreach (const QNetworkAddressEntry &entry, netinterface.addressEntries()) {
             if (entry.ip().isInSubnet(QHostAddress::parseSubnet("fe80::/10"))
                 || entry.ip().isInSubnet(QHostAddress::parseSubnet("169.254/16")))
                 continue; // link-local bind will fail, at least on Linux, so skip it.