From c35a3a9bea759cadf1e975a2a62e50789cad096c Mon Sep 17 00:00:00 2001
From: Javier <dev.git@javispedro.com>
Date: Tue, 2 Dec 2014 23:33:19 +0100
Subject: define new D-Bus interface, use qmake to generate adaptors/interfaces

also slightly clean up the way d-bus is handled both in daemon and UI
---
 daemon/daemon.pro | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'daemon/daemon.pro')

diff --git a/daemon/daemon.pro b/daemon/daemon.pro
index c59d408..3306541 100644
--- a/daemon/daemon.pro
+++ b/daemon/daemon.pro
@@ -20,7 +20,6 @@ SOURCES += \
     notificationmanager.cpp \
     watchconnector.cpp \
     dbusconnector.cpp \
-    dbusadaptor.cpp \
     appmanager.cpp \
     musicmanager.cpp \
     datalogmanager.cpp \
@@ -38,7 +37,6 @@ HEADERS += \
     notificationmanager.h \
     watchconnector.h \
     dbusconnector.h \
-    dbusadaptor.h \
     settings.h \
     appmanager.h \
     musicmanager.h \
@@ -51,10 +49,11 @@ HEADERS += \
     packer.h
 
 OTHER_FILES += \
-    org.pebbled.xml \
     ../log4qt-debug.conf \
     ../log4qt-release.conf
 
+DBUS_ADAPTORS += ../org.pebbled.Watch.xml
+
 INSTALLS += target pebbled confile
 
 target.path = /usr/bin
-- 
cgit v1.2.3