diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2010-04-08 11:31:56 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-08 11:40:27 +0200 |
| commit | b34817d3fce5b96c335cb583a3313e7bd9f8c07c (patch) | |
| tree | 8e86b39c662b537e6a5da92a6c493f18918a0833 /src/plugins/bearer/networkmanager | |
| parent | 33937d31e5ba48a8dc430f705db0d6e569996657 (diff) | |
Introduce a qconfig feature for QtDBus
QtDBus module is useless with QT_NO_PROPERTIES. Add D-Bus section and
DBUS feature which requires PROPERTIES. Update qfeatures.h. Disable
QtDBus module, a bearer management plugin for NetworkManager and a
script plugin for QtDBus when QT_NO_DBUS is defined.
Merge-request: 511
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Diffstat (limited to 'src/plugins/bearer/networkmanager')
7 files changed, 26 insertions, 0 deletions
diff --git a/src/plugins/bearer/networkmanager/main.cpp b/src/plugins/bearer/networkmanager/main.cpp index 6c97a22ae7..88068fc5bd 100644 --- a/src/plugins/bearer/networkmanager/main.cpp +++ b/src/plugins/bearer/networkmanager/main.cpp @@ -45,6 +45,8 @@ #include <QtCore/qdebug.h> +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE class QNetworkManagerEnginePlugin : public QBearerEnginePlugin @@ -87,3 +89,5 @@ Q_EXPORT_STATIC_PLUGIN(QNetworkManagerEnginePlugin) Q_EXPORT_PLUGIN2(qnmbearer, QNetworkManagerEnginePlugin) QT_END_NAMESPACE + +#endif // QT_NO_DBUS diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp index 72d6838f37..06533a1e1c 100644 --- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp +++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp @@ -56,6 +56,8 @@ #include <QDBusMessage> #include <QDBusReply> +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE QNetworkManagerEngine::QNetworkManagerEngine(QObject *parent) @@ -915,3 +917,4 @@ QNetworkConfigurationPrivatePointer QNetworkManagerEngine::defaultConfiguration( QT_END_NAMESPACE +#endif // QT_NO_DBUS diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h index af3f450908..964726e79a 100644 --- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h +++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h @@ -60,6 +60,8 @@ #include <QMap> #include <QVariant> +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE class QNetworkManagerEngine : public QBearerEngineImpl @@ -137,5 +139,7 @@ private: QT_END_NAMESPACE +#endif // QT_NO_DBUS + #endif diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp index a20370bc9c..31a9aa1664 100644 --- a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp +++ b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp @@ -54,6 +54,8 @@ #include "qnetworkmanagerservice.h" #include "qnmdbushelper.h" +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE static QDBusConnection dbusConnection = QDBusConnection::systemBus(); @@ -993,3 +995,5 @@ QStringList QNetworkManagerIp4Config::domains() const } QT_END_NAMESPACE + +#endif // QT_NO_DBUS diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.h b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.h index 95f5b4a16d..f006a20e24 100644 --- a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.h +++ b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.h @@ -66,6 +66,8 @@ #include <QMap> #include "qnmdbushelper.h" +#ifndef QT_NO_DBUS + #ifndef NETWORK_MANAGER_H typedef enum NMDeviceType { @@ -442,4 +444,5 @@ public: QT_END_NAMESPACE +#endif // QT_NO_DBUS #endif //QNETWORKMANAGERSERVICE_H diff --git a/src/plugins/bearer/networkmanager/qnmdbushelper.cpp b/src/plugins/bearer/networkmanager/qnmdbushelper.cpp index e195eeb3db..68dde6e6f6 100644 --- a/src/plugins/bearer/networkmanager/qnmdbushelper.cpp +++ b/src/plugins/bearer/networkmanager/qnmdbushelper.cpp @@ -52,6 +52,8 @@ #include <QDebug> +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE QNmDBusHelper::QNmDBusHelper(QObject * parent) @@ -124,3 +126,5 @@ void QNmDBusHelper::slotSettingsRemoved() } QT_END_NAMESPACE + +#endif // QT_NO_DBUS diff --git a/src/plugins/bearer/networkmanager/qnmdbushelper.h b/src/plugins/bearer/networkmanager/qnmdbushelper.h index 933d55a2ca..7a9563d353 100644 --- a/src/plugins/bearer/networkmanager/qnmdbushelper.h +++ b/src/plugins/bearer/networkmanager/qnmdbushelper.h @@ -46,6 +46,8 @@ #include <QDBusContext> #include <QMap> +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE class QNmDBusHelper: public QObject, protected QDBusContext @@ -72,4 +74,6 @@ Q_SIGNALS: QT_END_NAMESPACE +#endif // QT_NO_DBUS + #endif// QNMDBUSHELPERPRIVATE_H |