Introduce a qconfig feature for Bearer Management

Merge-request: 517
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>

11 files changed, 43 insertions, 1 deletions

diff --git a/src/network/bearer/qbearerengine.cpp b/src/network/bearer/qbearerengine.cpp
index c42e2d2..2f8624a 100644
--- a/src/network/bearer/qbearerengine.cpp
+++ b/src/network/bearer/qbearerengine.cpp
@@ -41,6 +41,8 @@
 
 #include "qbearerengine_p.h"
 
+#ifndef QT_NO_BEARERMANAGEMENT
+
 QT_BEGIN_NAMESPACE
 
 QBearerEngine::QBearerEngine(QObject *parent)
@@ -110,4 +112,6 @@ bool QBearerEngine::configurationsInUse() const
 
 #include "moc_qbearerengine_p.cpp"
 
+#endif // QT_NO_BEARERMANAGEMENT
+
 QT_END_NAMESPACE
diff --git a/src/network/bearer/qbearerengine_p.h b/src/network/bearer/qbearerengine_p.h
index fd4bf87..70aa5fa 100644
--- a/src/network/bearer/qbearerengine_p.h
+++ b/src/network/bearer/qbearerengine_p.h
@@ -65,6 +65,8 @@
 #include <QtCore/qsharedpointer.h>
 #include <QtCore/qmutex.h>
 
+#ifndef QT_NO_BEARERMANAGEMENT
+
 QT_BEGIN_NAMESPACE
 
 class QNetworkConfiguration;
@@ -110,4 +112,6 @@ protected:
 
 QT_END_NAMESPACE
 
+#endif // QT_NO_BEARERMANAGEMENT
+
 #endif
diff --git a/src/network/bearer/qbearerplugin.cpp b/src/network/bearer/qbearerplugin.cpp
index 4509fd0..a5e8918 100644
--- a/src/network/bearer/qbearerplugin.cpp
+++ b/src/network/bearer/qbearerplugin.cpp
@@ -43,6 +43,8 @@
 
 #include <QtCore/qdebug.h>
 
+#ifndef QT_NO_BEARERMANAGEMENT
+
 QT_BEGIN_NAMESPACE
 
 QBearerEnginePlugin::QBearerEnginePlugin(QObject *parent)
@@ -55,3 +57,5 @@ QBearerEnginePlugin::~QBearerEnginePlugin()
 }
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_BEARERMANAGEMENT
diff --git a/src/network/bearer/qbearerplugin_p.h b/src/network/bearer/qbearerplugin_p.h
index 36709c2..9652f14 100644
--- a/src/network/bearer/qbearerplugin_p.h
+++ b/src/network/bearer/qbearerplugin_p.h
@@ -58,6 +58,8 @@
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>
 
+#ifndef QT_NO_BEARERMANAGEMENT
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -89,5 +91,6 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif
+#endif // QT_NO_BEARERMANAGEMENT
 
+#endif
diff --git a/src/network/bearer/qnetworkconfigmanager.cpp b/src/network/bearer/qnetworkconfigmanager.cpp
index 6c6e28b..102b347 100644
--- a/src/network/bearer/qnetworkconfigmanager.cpp
+++ b/src/network/bearer/qnetworkconfigmanager.cpp
@@ -46,6 +46,8 @@
 
 #include <QtCore/qstringlist.h>
 
+#ifndef QT_NO_BEARERMANAGEMENT
+
 QT_BEGIN_NAMESPACE
 
 Q_GLOBAL_STATIC(QNetworkConfigurationManagerPrivate, connManager);
@@ -304,3 +306,4 @@ void QNetworkConfigurationManager::updateConfigurations()
 
 QT_END_NAMESPACE
 
+#endif // QT_NO_BEARERMANAGEMENT
diff --git a/src/network/bearer/qnetworkconfigmanager.h b/src/network/bearer/qnetworkconfigmanager.h
index 79bb27c..3e44be1 100644
--- a/src/network/bearer/qnetworkconfigmanager.h
+++ b/src/network/bearer/qnetworkconfigmanager.h
@@ -49,6 +49,8 @@
 #include <QtCore/qobject.h>
 #include <QtNetwork/qnetworkconfiguration.h>
 
+#ifndef QT_NO_BEARERMANAGEMENT
+
 QT_BEGIN_HEADER
 
 #ifndef QT_MOBILITY_BEARER
@@ -111,5 +113,7 @@ QTM_END_NAMESPACE
 
 QT_END_HEADER
 
+#endif // QT_NO_BEARERMANAGEMENT
+
 #endif //QNETWORKCONFIGURATIONMANAGER_H
 
diff --git a/src/network/bearer/qnetworkconfigmanager_p.cpp b/src/network/bearer/qnetworkconfigmanager_p.cpp
index b4d4c6b..a651dd1 100644
--- a/src/network/bearer/qnetworkconfigmanager_p.cpp
+++ b/src/network/bearer/qnetworkconfigmanager_p.cpp
@@ -50,6 +50,8 @@
 #include <QtCore/qthread.h>
 #include <QtCore/private/qcoreapplication_p.h>
 
+#ifndef QT_NO_BEARERMANAGEMENT
+
 QT_BEGIN_NAMESPACE
 
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
@@ -503,3 +505,5 @@ void QNetworkConfigurationManagerPrivate::disablePolling()
 }
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_BEARERMANAGEMENT
diff --git a/src/network/bearer/qnetworkconfigmanager_p.h b/src/network/bearer/qnetworkconfigmanager_p.h
index 4cb29e9..0649031 100644
--- a/src/network/bearer/qnetworkconfigmanager_p.h
+++ b/src/network/bearer/qnetworkconfigmanager_p.h
@@ -59,6 +59,8 @@
 #include <QtCore/qmutex.h>
 #include <QtCore/qset.h>
 
+#ifndef QT_NO_BEARERMANAGEMENT
+
 QT_BEGIN_NAMESPACE
 
 class QBearerEngine;
@@ -129,4 +131,6 @@ Q_NETWORK_EXPORT QNetworkConfigurationManagerPrivate *qNetworkConfigurationManag
 
 QT_END_NAMESPACE
 
+#endif // QT_NO_BEARERMANAGEMENT
+
 #endif //QNETWORKCONFIGURATIONMANAGERPRIVATE_H
diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp
index 638bee7..1ed6cbb 100644
--- a/src/network/bearer/qnetworksession.cpp
+++ b/src/network/bearer/qnetworksession.cpp
@@ -47,6 +47,8 @@
 #include "qnetworkconfigmanager_p.h"
 #include "qnetworksession_p.h"
 
+#ifndef QT_NO_BEARERMANAGEMENT
+
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -706,3 +708,5 @@ void QNetworkSession::disconnectNotify(const char *signal)
 #include "moc_qnetworksession.cpp"
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_BEARERMANAGEMENT
diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h
index 2911d0a..e7fffac 100644
--- a/src/network/bearer/qnetworksession.h
+++ b/src/network/bearer/qnetworksession.h
@@ -48,6 +48,8 @@
 #include <QtCore/qvariant.h>
 #include <QtNetwork/qnetworkconfiguration.h>
 
+#ifndef QT_NO_BEARERMANAGEMENT
+
 #if defined(Q_OS_WIN) && defined(interface)
 #undef interface
 #endif
@@ -149,4 +151,6 @@ QTM_END_NAMESPACE
 
 QT_END_HEADER
 
+#endif // QT_NO_BEARERMANAGEMENT
+
 #endif //QNETWORKSESSION_H
diff --git a/src/network/bearer/qnetworksession_p.h b/src/network/bearer/qnetworksession_p.h
index 1a6159a..c7b5718 100644
--- a/src/network/bearer/qnetworksession_p.h
+++ b/src/network/bearer/qnetworksession_p.h
@@ -56,6 +56,8 @@
 #include "qnetworksession.h"
 #include "qnetworkconfiguration_p.h"
 
+#ifndef QT_NO_BEARERMANAGEMENT
+
 QT_BEGIN_NAMESPACE
 
 class Q_NETWORK_EXPORT QNetworkSessionPrivate : public QObject
@@ -146,5 +148,7 @@ protected:
 
 QT_END_NAMESPACE
 
+#endif // QT_NO_BEARERMANAGEMENT
+
 #endif //QNETWORKSESSIONPRIVATE_H