diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2010-04-08 09:31:56 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-08 09:40:27 (GMT) |
| commit | b34817d3fce5b96c335cb583a3313e7bd9f8c07c (patch) | |
| tree | 8e86b39c662b537e6a5da92a6c493f18918a0833 /src/dbus/qdbusabstractadaptor.cpp | |
| parent | 33937d31e5ba48a8dc430f705db0d6e569996657 (diff) | |
| download | Qt-b34817d3fce5b96c335cb583a3313e7bd9f8c07c.zip Qt-b34817d3fce5b96c335cb583a3313e7bd9f8c07c.tar.gz Qt-b34817d3fce5b96c335cb583a3313e7bd9f8c07c.tar.bz2 | |
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/dbus/qdbusabstractadaptor.cpp')
| -rw-r--r-- | src/dbus/qdbusabstractadaptor.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/dbus/qdbusabstractadaptor.cpp b/src/dbus/qdbusabstractadaptor.cpp index 4f54570..98670d1 100644 --- a/src/dbus/qdbusabstractadaptor.cpp +++ b/src/dbus/qdbusabstractadaptor.cpp @@ -53,6 +53,8 @@ #include "qdbusabstractadaptor_p.h" #include "qdbusmetatype_p.h" +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE QDBusAdaptorConnector *qDBusFindAdaptorConnector(QObject *obj) @@ -378,3 +380,5 @@ void QDBusAdaptorConnector::relaySignal(QObject * _t1, const QMetaObject * _t2, } QT_END_NAMESPACE + +#endif // QT_NO_DBUS |