Better fix for d524da81ee257a6bd67d32d0bc870280a7d5b8a4.

Wrap new APIs in ifndef QT_MOBILITY_BEARER.

2 files changed, 8 insertions, 9 deletions

diff --git a/src/network/bearer/qnetworkconfiguration.cpp b/src/network/bearer/qnetworkconfiguration.cpp
index 60851ac..3190a30 100644
--- a/src/network/bearer/qnetworkconfiguration.cpp
+++ b/src/network/bearer/qnetworkconfiguration.cpp
@@ -406,13 +406,6 @@ 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 18b92a9..593dbbe 100644
--- a/src/network/bearer/qnetworkconfiguration.h
+++ b/src/network/bearer/qnetworkconfiguration.h
@@ -103,6 +103,7 @@ public:
 
     Q_DECLARE_FLAGS(StateFlags, StateFlag)
 
+#ifndef QT_MOBILITY_BEARER
     enum BearerType {
         BearerUnknown,
         BearerEthernet,
@@ -114,17 +115,22 @@ public:
         BearerBluetooth,
         BearerWiMAX
     };
+#endif
 
     StateFlags state() const;
     Type type() const;
     Purpose purpose() const;
 
-    // Required to maintain source compatibility with Qt Mobility.
+#ifndef QT_MOBILITY_BEARER
 #ifdef QT_DEPRECATED
-    QT_DEPRECATED QString bearerName() const;
+    // Required to maintain source compatibility with Qt Mobility.
+    QT_DEPRECATED inline QString bearerName() const { return bearerTypeName(); }
 #endif
     BearerType bearerType() const;
     QString bearerTypeName() const;
+#else
+    QString bearerName() const;
+#endif
 
     QString identifier() const;
     bool isRoamingAvailable() const;