diff options
| author | Wolfgang Beck <wolfgang.beck@nokia.com> | 2010-03-30 01:53:42 (GMT) |
|---|---|---|
| committer | Wolfgang Beck <wolfgang.beck@nokia.com> | 2010-03-30 01:53:42 (GMT) |
| commit | 0d7a0b1bf2ab50621ed662a3e178d2ad5add4114 (patch) | |
| tree | d9ec0dd6f3fd9abc213368f17f3bfdb2c2659610 /src/network/bearer/qnetworksession.h | |
| parent | ffd4c014747f6842b9103d67204b5b54626bf876 (diff) | |
| download | Qt-0d7a0b1bf2ab50621ed662a3e178d2ad5add4114.zip Qt-0d7a0b1bf2ab50621ed662a3e178d2ad5add4114.tar.gz Qt-0d7a0b1bf2ab50621ed662a3e178d2ad5add4114.tar.bz2 | |
MONILITY-645
Merging bearer header.
Diffstat (limited to 'src/network/bearer/qnetworksession.h')
| -rw-r--r-- | src/network/bearer/qnetworksession.h | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h index 596f527..2681d1f 100644 --- a/src/network/bearer/qnetworksession.h +++ b/src/network/bearer/qnetworksession.h @@ -54,12 +54,19 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE - -QT_MODULE(Network) +#ifndef QT_MOBILITY_BEARER + #include <QtCore/qshareddata.h> + QT_BEGIN_NAMESPACE + QT_MODULE(Network) + #define QNetworkSessionExport Q_NETWORK_EXPORT +#else + #include "qmobilityglobal.h" + QTM_BEGIN_NAMESPACE + #define QNetworkSessionExport Q_BEARER_EXPORT +#endif class QNetworkSessionPrivate; -class Q_NETWORK_EXPORT QNetworkSession : public QObject +class QNetworkSessionExport QNetworkSession : public QObject { Q_OBJECT public: @@ -80,8 +87,11 @@ public: OperationNotSupportedError, InvalidConfigurationError }; - - explicit QNetworkSession(const QNetworkConfiguration& connConfig, QObject* parent =0); +#ifndef QT_MOBILITY_BEARER + QNetworkSession(const QNetworkConfiguration& connConfig, QObject* parent =0); +#else + explicit QNetworkSession(const QNetworkConfiguration& connConfig, QObject* parent =0); +#endif virtual ~QNetworkSession(); bool isOpen() const; @@ -131,7 +141,11 @@ private: friend class QNetworkSessionPrivate; }; -QT_END_NAMESPACE +#ifndef QT_MOBILITY_BEARER + QT_END_NAMESPACE +#else + QTM_END_NAMESPACE +#endif QT_END_HEADER |