summaryrefslogtreecommitdiff
path: root/sowatchd
diff options
context:
space:
mode:
authorJavier S. Pedro <maemo@javispedro.com>2013-05-08 18:04:31 +0200
committerJavier S. Pedro <maemo@javispedro.com>2013-05-08 18:04:31 +0200
commitccd19d2b7ee4184503ea46b98333b27a5613190e (patch)
treef78cc3f3c946d7a4f8167f72fb20703c65494d84 /sowatchd
parent6003bf81107dd9be51589c074b74c5af82bfc8ab (diff)
downloadsowatch-ccd19d2b7ee4184503ea46b98333b27a5613190e.tar.gz
sowatch-ccd19d2b7ee4184503ea46b98333b27a5613190e.zip
big change: a new abstract BluetoothWatch class
Diffstat (limited to 'sowatchd')
-rw-r--r--sowatchd/sowatchd.pro3
-rw-r--r--sowatchd/watchhandler.cpp4
2 files changed, 6 insertions, 1 deletions
diff --git a/sowatchd/sowatchd.pro b/sowatchd/sowatchd.pro
index 17176fb..3ffa490 100644
--- a/sowatchd/sowatchd.pro
+++ b/sowatchd/sowatchd.pro
@@ -11,6 +11,9 @@ HEADERS += daemon.h daemonadaptor.h watchhandler.h
LIBS += -L$$OUT_PWD/../libsowatch/ -lsowatch
INCLUDEPATH += $$PWD/../libsowatch
DEPENDPATH += $$PWD/../libsowatch
+LIBS += -L$$OUT_PWD/../libsowatchbt/ -lsowatchbt
+INCLUDEPATH += $$PWD/../libsowatchbt
+DEPENDPATH += $$PWD/../libsowatchbt
# Library & target paths
!isEmpty(MEEGO_VERSION_MAJOR)|maemo5 {
diff --git a/sowatchd/watchhandler.cpp b/sowatchd/watchhandler.cpp
index a2ea76a..cdd520d 100644
--- a/sowatchd/watchhandler.cpp
+++ b/sowatchd/watchhandler.cpp
@@ -4,7 +4,9 @@ using namespace sowatch;
WatchHandler::WatchHandler(ConfigKey *config, QObject *parent)
: QObject(parent),
- _config(config->getSubkey("", this))
+ _config(config->getSubkey("", this)),
+ _watch(0),
+ _server(0)
{
Registry *registry = Registry::registry();