summaryrefslogtreecommitdiffstats
path: root/src/dbus/qdbusabstractinterface.cpp
diff options
context:
space:
mode:
authorTasuku Suzuki <tasuku.suzuki@nokia.com>2010-04-08 09:31:56 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-04-08 09:40:27 (GMT)
commitb34817d3fce5b96c335cb583a3313e7bd9f8c07c (patch)
tree8e86b39c662b537e6a5da92a6c493f18918a0833 /src/dbus/qdbusabstractinterface.cpp
parent33937d31e5ba48a8dc430f705db0d6e569996657 (diff)
downloadQt-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/qdbusabstractinterface.cpp')
-rw-r--r--src/dbus/qdbusabstractinterface.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp
index 48ec3b6..1a7c417 100644
--- a/src/dbus/qdbusabstractinterface.cpp
+++ b/src/dbus/qdbusabstractinterface.cpp
@@ -51,6 +51,8 @@
#include <qdebug.h>
+#ifndef QT_NO_DBUS
+
QT_BEGIN_NAMESPACE
static QDBusError checkIfValid(const QString &service, const QString &path,
@@ -765,4 +767,6 @@ QDBusMessage QDBusAbstractInterface::internalConstCall(QDBus::CallMode mode,
QT_END_NAMESPACE
+#endif // QT_NO_DBUS
+
#include "moc_qdbusabstractinterface.cpp"