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/dbus/qdbus_symbols_p.h | |
| 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/dbus/qdbus_symbols_p.h')
| -rw-r--r-- | src/dbus/qdbus_symbols_p.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h index 7168e050ef..5b6b5fbd55 100644 --- a/src/dbus/qdbus_symbols_p.h +++ b/src/dbus/qdbus_symbols_p.h @@ -57,6 +57,8 @@ #include <QtCore/qglobal.h> #include <dbus/dbus.h> +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE #if !defined QT_LINKED_LIBDBUS @@ -367,4 +369,5 @@ DEFINEFUNC(dbus_bool_t , dbus_threads_init_default, (), (), return) QT_END_NAMESPACE -#endif +#endif // QT_NO_DBUS +#endif // QDBUS_SYMBOLS_P_H |