equal
deleted
inserted
replaced
173 |
173 |
174 // ignore loopback interface |
174 // ignore loopback interface |
175 if (interface.flags() & QNetworkInterface::IsLoopBack) |
175 if (interface.flags() & QNetworkInterface::IsLoopBack) |
176 continue; |
176 continue; |
177 |
177 |
178 // ignore WLAN interface handled in seperate engine |
178 // ignore WLAN interface handled in separate engine |
179 if (qGetInterfaceType(interface.name()) == "WLAN") |
179 if (qGetInterfaceType(interface.name()) == "WLAN") |
180 continue; |
180 continue; |
181 |
181 |
182 QNetworkConfigurationPrivate *cpPriv = new QNetworkConfigurationPrivate; |
182 QNetworkConfigurationPrivate *cpPriv = new QNetworkConfigurationPrivate; |
183 const QString humanReadableName = interface.humanReadableName(); |
183 const QString humanReadableName = interface.humanReadableName(); |
196 if (interface.name().isEmpty()) |
196 if (interface.name().isEmpty()) |
197 cpPriv->bearer = QLatin1String("Unknown"); |
197 cpPriv->bearer = QLatin1String("Unknown"); |
198 else |
198 else |
199 cpPriv->bearer = qGetInterfaceType(interface.name()); |
199 cpPriv->bearer = qGetInterfaceType(interface.name()); |
200 |
200 |
201 if (interface.flags() & QNetworkInterface::IsUp) |
201 if((interface.flags() & QNetworkInterface::IsUp) && !interface.addressEntries().isEmpty()) |
202 cpPriv->state |= QNetworkConfiguration::Active; |
202 cpPriv->state |= QNetworkConfiguration::Active; |
203 |
203 |
204 configurationInterface[identifier] = interface.name(); |
204 configurationInterface[identifier] = interface.name(); |
205 |
205 |
206 foundConfigurations.append(cpPriv); |
206 foundConfigurations.append(cpPriv); |