diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2010-04-15 05:59:08 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-04-15 05:59:08 (GMT) |
| commit | 3925bab16a88822fcef749cb6ba7c542688c2fae (patch) | |
| tree | d1aa68416cf61baef54b787dc53ad3ad52bd78a1 /src/plugins | |
| parent | 86b483104fa1e8c1b2bcd255f9b94992d1d1b864 (diff) | |
| download | Qt-3925bab16a88822fcef749cb6ba7c542688c2fae.zip Qt-3925bab16a88822fcef749cb6ba7c542688c2fae.tar.gz Qt-3925bab16a88822fcef749cb6ba7c542688c2fae.tar.bz2 | |
Introduce a qconfig feature for Bearer Management
Merge-request: 517
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/bearer/generic/main.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/bearer/generic/qgenericengine.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/bearer/generic/qgenericengine.h | 4 | ||||
| -rw-r--r-- | src/plugins/bearer/qbearerengine_impl.h | 3 | ||||
| -rw-r--r-- | src/plugins/bearer/qnetworksession_impl.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/bearer/qnetworksession_impl.h | 4 |
6 files changed, 23 insertions, 0 deletions
diff --git a/src/plugins/bearer/generic/main.cpp b/src/plugins/bearer/generic/main.cpp index ba85d93..ec1b689 100644 --- a/src/plugins/bearer/generic/main.cpp +++ b/src/plugins/bearer/generic/main.cpp @@ -45,6 +45,8 @@ #include <QtCore/qdebug.h> +#ifndef QT_NO_BEARERMANAGEMENT + QT_BEGIN_NAMESPACE class QGenericEnginePlugin : public QBearerEnginePlugin @@ -82,3 +84,5 @@ Q_EXPORT_STATIC_PLUGIN(QGenericEnginePlugin) Q_EXPORT_PLUGIN2(qgenericbearer, QGenericEnginePlugin) QT_END_NAMESPACE + +#endif // QT_NO_BEARERMANAGEMENT diff --git a/src/plugins/bearer/generic/qgenericengine.cpp b/src/plugins/bearer/generic/qgenericengine.cpp index d65025b..41ff3e0 100644 --- a/src/plugins/bearer/generic/qgenericengine.cpp +++ b/src/plugins/bearer/generic/qgenericengine.cpp @@ -64,6 +64,8 @@ #include <unistd.h> #endif +#ifndef QT_NO_BEARERMANAGEMENT + QT_BEGIN_NAMESPACE #ifndef QT_NO_NETWORKINTERFACE @@ -349,3 +351,4 @@ bool QGenericEngine::requiresPolling() const QT_END_NAMESPACE +#endif // QT_NO_BEARERMANAGEMENT diff --git a/src/plugins/bearer/generic/qgenericengine.h b/src/plugins/bearer/generic/qgenericengine.h index 616a3fd..82d22af 100644 --- a/src/plugins/bearer/generic/qgenericengine.h +++ b/src/plugins/bearer/generic/qgenericengine.h @@ -47,6 +47,8 @@ #include <QMap> #include <QTimer> +#ifndef QT_NO_BEARERMANAGEMENT + QT_BEGIN_NAMESPACE class QNetworkConfigurationPrivate; @@ -89,5 +91,7 @@ private: QT_END_NAMESPACE +#endif // QT_NO_BEARERMANAGEMENT + #endif diff --git a/src/plugins/bearer/qbearerengine_impl.h b/src/plugins/bearer/qbearerengine_impl.h index 740def3..6c30d0f 100644 --- a/src/plugins/bearer/qbearerengine_impl.h +++ b/src/plugins/bearer/qbearerengine_impl.h @@ -44,6 +44,8 @@ #include <QtNetwork/private/qbearerengine_p.h> +#ifndef QT_NO_BEARERMANAGEMENT + QT_BEGIN_NAMESPACE class QBearerEngineImpl : public QBearerEngine @@ -78,4 +80,5 @@ Q_SIGNALS: QT_END_NAMESPACE +#endif // QT_NO_BEARERMANAGEMENT #endif diff --git a/src/plugins/bearer/qnetworksession_impl.cpp b/src/plugins/bearer/qnetworksession_impl.cpp index 33cce69..ef5f347 100644 --- a/src/plugins/bearer/qnetworksession_impl.cpp +++ b/src/plugins/bearer/qnetworksession_impl.cpp @@ -49,6 +49,8 @@ #include <QtCore/qdebug.h> #include <QtCore/qmutex.h> +#ifndef QT_NO_BEARERMANAGEMENT + QT_BEGIN_NAMESPACE static QBearerEngineImpl *getEngineFromId(const QString &id) @@ -439,3 +441,6 @@ void QNetworkSessionPrivateImpl::decrementTimeout() } QT_END_NAMESPACE + +#endif // QT_NO_BEARERMANAGEMENT + diff --git a/src/plugins/bearer/qnetworksession_impl.h b/src/plugins/bearer/qnetworksession_impl.h index acf1cce..a4902eb 100644 --- a/src/plugins/bearer/qnetworksession_impl.h +++ b/src/plugins/bearer/qnetworksession_impl.h @@ -60,6 +60,8 @@ #include <QtCore/qdatetime.h> +#ifndef QT_NO_BEARERMANAGEMENT + QT_BEGIN_NAMESPACE class QBearerEngineImpl; @@ -129,5 +131,7 @@ private: QT_END_NAMESPACE +#endif // QT_NO_BEARERMANAGEMENT + #endif //QNETWORKSESSION_IMPL_H |