AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename "interface" to "iface:" there's a #define in windows.h

Browse Source 
Change-Id: Ibe5b1b60c6ea47e19612fffd149cd2d07116584b
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
This commit is contained in:
Thiago Macieira 2017-01-24 13:36:09 -08:00
parent 195298326f
commit d3671555cc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/bearer/qnetworksession_impl.cpp
View File

@ -210,10 +210,10 @@ QNetworkInterface QNetworkSessionPrivateImpl::currentInterface() const
if (!engine || state != QNetworkSession::Connected || !publicConfig.isValid()) if (!engine || state != QNetworkSession::Connected || !publicConfig.isValid())
return QNetworkInterface(); return QNetworkInterface();
QString interface = engine->getInterfaceFromId(activeConfig.identifier()); QString iface = engine->getInterfaceFromId(activeConfig.identifier());
if (interface.isEmpty()) if (iface.isEmpty())
return QNetworkInterface(); return QNetworkInterface();
return QNetworkInterface::interfaceFromName(interface); return QNetworkInterface::interfaceFromName(iface);
} }
#endif #endif