diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-26 05:44:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-26 05:44:28 (GMT) |
| commit | ae13ad51dda7246e73d282165201f637d04a667e (patch) | |
| tree | bc5f379a8f16bb9180179057d2651996f9e616ff /src/plugins | |
| parent | 22c2f6cfca945e9c377e509b7ff2252f55599b27 (diff) | |
| parent | 2931f07dbf824b7d11474bc040e08fcc8c01a166 (diff) | |
| download | Qt-ae13ad51dda7246e73d282165201f637d04a667e.zip Qt-ae13ad51dda7246e73d282165201f637d04a667e.tar.gz Qt-ae13ad51dda7246e73d282165201f637d04a667e.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/mobility-staging:
Speed up compilation of this test with MSVC.
Fix Symbian build when building for WINSCW with abld.
Fix file descriptor leak with generic engine on Linux.
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/bearer/generic/qgenericengine.cpp | 11 | ||||
| -rw-r--r-- | src/plugins/bearer/symbian/symbian.pro | 1 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/plugins/bearer/generic/qgenericengine.cpp b/src/plugins/bearer/generic/qgenericengine.cpp index e96b80c..dc89342 100644 --- a/src/plugins/bearer/generic/qgenericengine.cpp +++ b/src/plugins/bearer/generic/qgenericengine.cpp @@ -126,14 +126,11 @@ static QString qGetInterfaceType(const QString &interface) ifreq request; strncpy(request.ifr_name, interface.toLocal8Bit().data(), sizeof(request.ifr_name)); - if (ioctl(sock, SIOCGIFHWADDR, &request) >= 0) { - switch (request.ifr_hwaddr.sa_family) { - case ARPHRD_ETHER: - return QLatin1String("Ethernet"); - } - } - + int result = ioctl(sock, SIOCGIFHWADDR, &request); close(sock); + + if (result >= 0 && request.ifr_hwaddr.sa_family == ARPHRD_ETHER) + return QLatin1String("Ethernet"); #else Q_UNUSED(interface); #endif diff --git a/src/plugins/bearer/symbian/symbian.pro b/src/plugins/bearer/symbian/symbian.pro index 9fd1a74..9613def 100644 --- a/src/plugins/bearer/symbian/symbian.pro +++ b/src/plugins/bearer/symbian/symbian.pro @@ -21,6 +21,7 @@ exists($${EPOCROOT}epoc32/release/armv5/lib/cmmanager.lib) { } INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE +symbian-abld:INCLUDEPATH += $$QT_BUILD_TREE/include/QtNetwork/private LIBS += -lcommdb \ -lapsettingshandlerui \ |