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/qdbus_symbols.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/qdbus_symbols.cpp')
| -rw-r--r-- | src/dbus/qdbus_symbols.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/dbus/qdbus_symbols.cpp b/src/dbus/qdbus_symbols.cpp index b5cbbf2..97b6cb6 100644 --- a/src/dbus/qdbus_symbols.cpp +++ b/src/dbus/qdbus_symbols.cpp @@ -44,6 +44,8 @@ #include <QtCore/qmutex.h> #include <private/qmutexpool_p.h> +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE void *qdbus_resolve_me(const char *name); @@ -109,6 +111,8 @@ void *qdbus_resolve_me(const char *name) Q_DESTRUCTOR_FUNCTION(qdbus_unloadLibDBus) +#endif // QT_LINKED_LIBDBUS + QT_END_NAMESPACE -#endif +#endif // QT_NO_DBUS |