diff -r ef0373b55136 -r 758a864f9613 src/network/bearer/qnetworkconfiguration.h --- a/src/network/bearer/qnetworkconfiguration.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/network/bearer/qnetworkconfiguration.h Mon Oct 04 01:19:32 2010 +0300 @@ -103,10 +103,35 @@ Q_DECLARE_FLAGS(StateFlags, StateFlag) +#ifndef QT_MOBILITY_BEARER + enum BearerType { + BearerUnknown, + BearerEthernet, + BearerWLAN, + Bearer2G, + BearerCDMA2000, + BearerWCDMA, + BearerHSPA, + BearerBluetooth, + BearerWiMAX + }; +#endif + StateFlags state() const; Type type() const; Purpose purpose() const; + +#ifndef QT_MOBILITY_BEARER +#ifdef QT_DEPRECATED + // 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; QList children() const;