diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-04-09 13:16:09 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-04-09 13:16:09 (GMT) |
| commit | 0bd75b67bc23d51670822305a31e19a74ca7134e (patch) | |
| tree | 41b37d4e21ffd4b7bb7974e6b2bf9aa6494b5781 /src/dbus/qdbusconnection.cpp | |
| parent | 5e5836702662783a4fba5f95a487948e5c6d2a4e (diff) | |
| parent | e4cae397e3737551752487000e152162d0878f88 (diff) | |
| download | Qt-0bd75b67bc23d51670822305a31e19a74ca7134e.zip Qt-0bd75b67bc23d51670822305a31e19a74ca7134e.tar.gz Qt-0bd75b67bc23d51670822305a31e19a74ca7134e.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/dbus/qdbusconnection.cpp')
| -rw-r--r-- | src/dbus/qdbusconnection.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index abaa486..abb3224 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -54,6 +54,8 @@ #include "qdbusthreaddebug_p.h" +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE class QDBusConnectionManager @@ -1048,3 +1050,5 @@ void QDBusConnectionPrivate::setBusService(const QDBusConnection &connection) */ QT_END_NAMESPACE + +#endif // QT_NO_DBUS |