Fix link error when building Bearer application with Qt Mobility

QtMobility uses the Qt header when compiling applications which
link against Mobility's Bearer library. Therefore
QNetworkConfiguration::bearerName() cannot be inline and refer to the
new QNetworkConfiguration::bearerTypeName() function (which doesn't
exist in Mobility)

Task-number: QTBUG-12378
Reviewed-by: Rohan McGovern
(cherry picked from commit d524da81ee257a6bd67d32d0bc870280a7d5b8a4)

2 files changed, 8 insertions, 1 deletions

diff --git a/src/network/bearer/qnetworkconfiguration.cpp b/src/network/bearer/qnetworkconfiguration.cpp
index b645916..8d57b97 100644
--- a/src/network/bearer/qnetworkconfiguration.cpp
+++ b/src/network/bearer/qnetworkconfiguration.cpp
@@ -406,6 +406,13 @@ QList<QNetworkConfiguration> QNetworkConfiguration::children() const
     This function is deprecated.  It is equivalent to calling bearerTypeName(), however
     bearerType() should be used in preference.
 */
+QString QNetworkConfiguration::bearerName() const
+{
+    // This function cannot be inline as it would break Qt Mobility.
+    // Qt Mobility uses the Qt header as well and since the Mobility Bearer library
+    // does not provide bearerTypeName() we cannot use an inline function.
+    return bearerTypeName();
+}
 
 /*!
     Returns the type of bearer used by this network configuration.
diff --git a/src/network/bearer/qnetworkconfiguration.h b/src/network/bearer/qnetworkconfiguration.h
index d9d36fd..e4f762a 100644
--- a/src/network/bearer/qnetworkconfiguration.h
+++ b/src/network/bearer/qnetworkconfiguration.h
@@ -120,7 +120,7 @@ public:
     Purpose purpose() const;
 
     // Required to maintain source compatibility with Qt Mobility.
-    QT_DEPRECATED inline QString bearerName() const { return bearerTypeName(); }
+    QT_DEPRECATED QString bearerName() const;
     BearerType bearerType() const;
     QString bearerTypeName() const;