diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-08-13 03:58:46 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-08-13 04:10:31 (GMT) |
| commit | 7e4807fed07e4c96086af00338601223b3353d29 (patch) | |
| tree | e0063074c21fdac076beb4ef4fa7928dda78960e /src/network/bearer/qnetworkconfiguration.cpp | |
| parent | ee62807198a2525577c14f718b98d07ae0ec7bec (diff) | |
| download | Qt-7e4807fed07e4c96086af00338601223b3353d29.zip Qt-7e4807fed07e4c96086af00338601223b3353d29.tar.gz Qt-7e4807fed07e4c96086af00338601223b3353d29.tar.bz2 | |
Better fix for d524da81ee257a6bd67d32d0bc870280a7d5b8a4.
Wrap new APIs in ifndef QT_MOBILITY_BEARER.
Diffstat (limited to 'src/network/bearer/qnetworkconfiguration.cpp')
| -rw-r--r-- | src/network/bearer/qnetworkconfiguration.cpp | 7 |
1 files changed, 0 insertions, 7 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. |