summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-08-03 05:33:11 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-08-03 05:33:11 (GMT)
commit972191f8e3bdbf702e11be8c0a72fca9e896f395 (patch)
tree8910a80be0332313ee5445698e8bdcf6b5bcf554
parented6d7222894a9bdc804d8c64845e2f0f356d2c01 (diff)
downloadQt-972191f8e3bdbf702e11be8c0a72fca9e896f395.zip
Qt-972191f8e3bdbf702e11be8c0a72fca9e896f395.tar.gz
Qt-972191f8e3bdbf702e11be8c0a72fca9e896f395.tar.bz2
Return 'Unknown' bearer type name for unknown bearer type.
-rw-r--r--src/network/bearer/qnetworkconfiguration.cpp2
-rw-r--r--src/network/bearer/qnetworkconfiguration_p.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/network/bearer/qnetworkconfiguration.cpp b/src/network/bearer/qnetworkconfiguration.cpp
index b645916..3190a30 100644
--- a/src/network/bearer/qnetworkconfiguration.cpp
+++ b/src/network/bearer/qnetworkconfiguration.cpp
@@ -506,7 +506,7 @@ QString QNetworkConfiguration::bearerTypeName() const
return QLatin1String("WiMAX");
}
- return QString();
+ return QLatin1String("Unknown");
}
QT_END_NAMESPACE
diff --git a/src/network/bearer/qnetworkconfiguration_p.h b/src/network/bearer/qnetworkconfiguration_p.h
index 0fc6ee9..2b0bbf6 100644
--- a/src/network/bearer/qnetworkconfiguration_p.h
+++ b/src/network/bearer/qnetworkconfiguration_p.h
@@ -81,7 +81,7 @@ public:
virtual QString bearerTypeName() const
{
- return QString();
+ return QLatin1String("Unknown");
}
QMap<unsigned int, QNetworkConfigurationPrivatePointer> serviceNetworkMembers;