diff options
| author | Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk> | 2012-04-06 13:38:59 -0300 |
|---|---|---|
| committer | Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk> | 2012-04-06 13:39:13 -0300 |
| commit | 63ce37b2c1a712892486d208b93a8ca3f44bc1ab (patch) | |
| tree | e8128503a8789e55d2697e5b8e5ecc94123ed7ad | |
| parent | c5979f96c48c756a47720580fc931ea3784e8192 (diff) | |
| parent | b189cbb146e46360d956d91ac3c931bdac0bbfab (diff) | |
Merge remote-tracking branch 'gkiagia/svc-fixes'
Reviewed-by: Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>
| -rw-r--r-- | TelepathyQt/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | TelepathyQt/dbus-object.cpp | 2 | ||||
| -rw-r--r-- | TelepathyQt/dbus-object.h | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/TelepathyQt/CMakeLists.txt b/TelepathyQt/CMakeLists.txt index 4f0a8032..e8e63f73 100644 --- a/TelepathyQt/CMakeLists.txt +++ b/TelepathyQt/CMakeLists.txt @@ -852,9 +852,7 @@ if(ENABLE_EXPERIMENTAL_SERVICE_SUPPORT) DBusObject dbus-object.h DBusService - dbus-service.h - Global - global.h) + dbus-service.h) # Generated headers which will be installed and exported set(telepathy_qt_service_gen_HEADERS @@ -871,6 +869,7 @@ if(ENABLE_EXPERIMENTAL_SERVICE_SUPPORT) base-connection-internal.h base-protocol.h base-protocol-internal.h + dbus-object.h dbus-service.h) add_custom_target(all-generated-service-sources) diff --git a/TelepathyQt/dbus-object.cpp b/TelepathyQt/dbus-object.cpp index 9a311d3e..cab20a01 100644 --- a/TelepathyQt/dbus-object.cpp +++ b/TelepathyQt/dbus-object.cpp @@ -22,6 +22,8 @@ #include <TelepathyQt/DBusObject> +#include "TelepathyQt/_gen/dbus-object.moc.hpp" + #include <QDBusConnection> namespace Tp diff --git a/TelepathyQt/dbus-object.h b/TelepathyQt/dbus-object.h index 6836a23e..1784fe08 100644 --- a/TelepathyQt/dbus-object.h +++ b/TelepathyQt/dbus-object.h @@ -38,6 +38,7 @@ namespace Tp class TP_QT_EXPORT DBusObject : public QObject { + Q_OBJECT Q_DISABLE_COPY(DBusObject) public: |