summaryrefslogtreecommitdiffstats
path: root/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-03-25 00:56:37 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-03-25 05:53:00 (GMT)
commit3ccbfc46ef2647421608522aa38c12958e4ea3c3 (patch)
tree874721600ffa38985ee99a98b6ce5043eae122a3 /src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp
parentaf5501d2bef7242d3949d639e2bab7e326654bb2 (diff)
downloadQt-3ccbfc46ef2647421608522aa38c12958e4ea3c3.zip
Qt-3ccbfc46ef2647421608522aa38c12958e4ea3c3.tar.gz
Qt-3ccbfc46ef2647421608522aa38c12958e4ea3c3.tar.bz2
Compile with QT_NO_NETWORKINTERFACE defined.
Diffstat (limited to 'src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp')
-rw-r--r--src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp
index d23bb0d..a20370b 100644
--- a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp
+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp
@@ -353,9 +353,9 @@ QString QNetworkManagerInterfaceDevice::udi() const
return d->connectionInterface->property("Udi").toString();
}
-QNetworkInterface QNetworkManagerInterfaceDevice::networkInterface() const
+QString QNetworkManagerInterfaceDevice::networkInterface() const
{
- return QNetworkInterface::interfaceFromName(d->connectionInterface->property("Interface").toString());
+ return d->connectionInterface->property("Interface").toString();
}
quint32 QNetworkManagerInterfaceDevice::ip4Address() const