From 972191f8e3bdbf702e11be8c0a72fca9e896f395 Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Tue, 3 Aug 2010 15:33:11 +1000
Subject: Return 'Unknown' bearer type name for unknown bearer type.

---
 src/network/bearer/qnetworkconfiguration.cpp | 2 +-
 src/network/bearer/qnetworkconfiguration_p.h | 2 +-
 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;
-- 
cgit v0.12