diff options
author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-08-09 08:26:47 (GMT) |
---|---|---|
committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-08-09 08:26:47 (GMT) |
commit | cfe96b7c99cb12a666111c7861aba74d535adc89 (patch) | |
tree | eda2c872b4446b8b4796162ea46c86a4ba171cc9 /src/network/bearer | |
parent | 86eec3f6f98b387bf6a815c1a8e916965928b317 (diff) | |
parent | 1d09376c4eec88ba94f00a4b045fc425c5f51346 (diff) | |
download | Qt-cfe96b7c99cb12a666111c7861aba74d535adc89.zip Qt-cfe96b7c99cb12a666111c7861aba74d535adc89.tar.gz Qt-cfe96b7c99cb12a666111c7861aba74d535adc89.tar.bz2 |
Merge remote branch 'origin/4.7' into oslo-staging-2/4.7
Conflicts:
doc/src/index.qdoc
src/dbus/qdbusconnection.cpp
src/gui/s60framework/qs60mainapplication.cpp
src/gui/s60framework/qs60mainappui.cpp
src/network/access/qnetworkrequest.cpp
src/network/bearer/qnetworkconfiguration.h
Diffstat (limited to 'src/network/bearer')
-rw-r--r-- | src/network/bearer/qnetworkconfiguration.cpp | 7 | ||||
-rw-r--r-- | src/network/bearer/qnetworkconfiguration.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/network/bearer/qnetworkconfiguration.cpp b/src/network/bearer/qnetworkconfiguration.cpp index 3190a30..60851ac 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 02f9cb6..18b92a9 100644 --- a/src/network/bearer/qnetworkconfiguration.h +++ b/src/network/bearer/qnetworkconfiguration.h @@ -121,7 +121,7 @@ public: // Required to maintain source compatibility with Qt Mobility. #ifdef QT_DEPRECATED - QT_DEPRECATED inline QString bearerName() const { return bearerTypeName(); } + QT_DEPRECATED QString bearerName() const; #endif BearerType bearerType() const; QString bearerTypeName() const; |