summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier <dev.git@javispedro.com>2016-01-07 23:45:57 +0100
committerJavier <dev.git@javispedro.com>2016-01-07 23:45:57 +0100
commit4d2b72d017bba51bf92f22c18f9331ba320474b6 (patch)
tree056d13f88484d5554a808a60a3206feb70bfadf6
parent5d82870a04d70ee6e3f075cd4e8a9b6f416e84bb (diff)
downloadsapd-master.tar.gz
sapd-master.zip
use new .pri file from libwatchfishHEADmaster
m---------libwatchfish0
-rw-r--r--sapd.pro10
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