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/qnetworkconfiguration.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/qnetworkconfiguration.h')
| -rw-r--r-- | src/network/bearer/qnetworkconfiguration.h | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/src/network/bearer/qnetworkconfiguration.h b/src/network/bearer/qnetworkconfiguration.h index dad6198..3b49d0a 100644 --- a/src/network/bearer/qnetworkconfiguration.h +++ b/src/network/bearer/qnetworkconfiguration.h @@ -42,19 +42,33 @@ #ifndef QNETWORKCONFIGURATION_H #define QNETWORKCONFIGURATION_H -#include <QtCore/qglobal.h> +#ifndef QT_MOBILITY_BEARER +# include <QtCore/qglobal.h> +#else +# include "qmobilityglobal.h" +#endif + #include <QtCore/qshareddata.h> #include <QtCore/qstring.h> #include <QtCore/qlist.h> -QT_BEGIN_HEADER +#if defined(Q_OS_WIN) && defined(interface) +#undef interface +#endif -QT_BEGIN_NAMESPACE +QT_BEGIN_HEADER -QT_MODULE(Network) +#ifndef QT_MOBILITY_BEARER + QT_BEGIN_NAMESPACE + QT_MODULE(Network) + #define QNetworkConfigurationExport Q_NETWORK_EXPORT +#else + QTM_BEGIN_NAMESPACE + #define QNetworkConfigurationExport Q_BEARER_EXPORT +#endif class QNetworkConfigurationPrivate; -class Q_NETWORK_EXPORT QNetworkConfiguration +class QNetworkConfigurationExport QNetworkConfiguration { public: QNetworkConfiguration(); @@ -108,7 +122,11 @@ private: QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> d; }; -QT_END_NAMESPACE +#ifndef QT_MOBILITY_BEARER + QT_END_NAMESPACE +#else + QTM_END_NAMESPACE +#endif QT_END_HEADER |