use new .pri file from libwatchfishHEADmaster

2 files changed, 3 insertions, 7 deletions

diff --git a/libwatchfish b/libwatchfish
-Subproject 41677b58d971ab57a79514d972f10acb0479713
+Subproject 87a7e79f3306558176c97a9f82c63949bbf214c
diff --git a/sapd.pro b/sapd.pro
index c066427..d50510e 100644
--- a/sapd.pro
+++ b/sapd.pro
@@ -9,13 +9,9 @@ PKGCONFIG += openssl
 exists(/usr/lib/pkgconfig/sailfishapp.pc) {
     # Building for Jolla Sailfish, Qt5, Bluez4(?)
     DEFINES  += SAILFISH
-    PKGCONFIG += dbus-1 timed-qt5 bluez-qt5 mpris-qt5
-    SOURCES  += libwatchfish/notificationmonitor.cpp libwatchfish/notification.cpp \
-        libwatchfish/walltimemonitor.cpp \
-        libwatchfish/musiccontroller.cpp
-    HEADERS  += libwatchfish/notificationmonitor.h libwatchfish/notificationmonitor_p.h libwatchfish/notification.h \
-        libwatchfish/walltimemonitor.h libwatchfish/walltimemonitor_p.h \
-        libwatchfish/musiccontroller.h libwatchfish/musiccontroller_p.h
+    PKGCONFIG += bluez-qt5
+    WATCHFISH_FEATURES = notificationmonitor walltime music
+    include(libwatchfish/libwatchfish.pri)
 } else {
     # Building for desktop, Qt5, Bluez5
     DEFINES  += DESKTOP