From 3340aa0ef68eb735c36185959c8dbd11178575bf Mon Sep 17 00:00:00 2001 From: Javier Date: Sun, 13 Dec 2015 03:18:09 +0100 Subject: Bump min Qt requirement to 5.2, bump libwatchfish version --- sapd.pro | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) (limited to 'sapd.pro') diff --git a/sapd.pro b/sapd.pro index 051c2c7..d29aca3 100644 --- a/sapd.pro +++ b/sapd.pro @@ -1,33 +1,24 @@ TARGET = sapd TEMPLATE = app -QT += core gui dbus -CONFIG += console +QT += core gui dbus bluetooth +CONFIG += console c++11 CONFIG += link_pkgconfig PKGCONFIG += openssl exists(/usr/lib/libsailfishapp.so) { - # Building for Jolla Sailfish, Qt5, Bluez4 - QT += bluetooth + # Building for Jolla Sailfish, Qt5, Bluez4(?) DEFINES += SAILFISH - PKGCONFIG += dbus-1 - CONFIG += c++11 - SOURCES += libwatchfish/notificationmonitor.cpp libwatchfish/notification.cpp - HEADERS += libwatchfish/notificationmonitor.h libwatchfish/notification.h -} else:greaterThan(QT_MAJOR_VERSION, 4) { + PKGCONFIG += dbus-1 timed-qt5 + SOURCES += libwatchfish/notificationmonitor.cpp libwatchfish/notification.cpp \ + libwatchfish/walltimemonitor.cpp + HEADERS += libwatchfish/notificationmonitor.h libwatchfish/notificationmonitor_p.h libwatchfish/notification.h \ + libwatchfish/walltimemonitor.h libwatchfish/walltimemonitor_p.h +} else { # Building for desktop, Qt5, Bluez5 - QT += bluetooth DEFINES += DESKTOP SOURCES += hfpag.cc HEADERS += hfpag.h -} else { - # Building for desktop, Qt4, Bluez5 - CONFIG += mobility - MOBILITY += connectivity - DEFINES += DESKTOP MANUAL_SDP - SOURCES += hfpag.cc - HEADERS += hfpag.h - PKGCONFIG += bluez } target.path = /usr/bin @@ -56,7 +47,6 @@ SOURCES += main.cc \ sapsocket.cc \ sappeer.cc \ capabilityagent.cc \ - qtjson/json.cc \ sapmanager.cc \ sapserviceinfo.cc \ sapchannelinfo.cc \ @@ -66,7 +56,9 @@ SOURCES += main.cc \ hostmanageragent.cc \ hostmanagerconn.cc \ notificationagent.cc \ - notificationconn.cc + notificationconn.cc \ + webproxyagent.cc \ + webproxyconn.cc HEADERS += \ sapbtlistener.h \ @@ -80,7 +72,6 @@ HEADERS += \ sapagent.h \ sappeer.h \ capabilityagent.h \ - qtjson/json.h \ sapmanager.h \ sapserviceinfo.h \ sapchannelinfo.h \ @@ -91,7 +82,9 @@ HEADERS += \ hostmanagerconn.h \ notificationagent.h \ notificationconn.h \ - endianhelpers.h + endianhelpers.h \ + webproxyagent.h \ + webproxyconn.h OTHER_FILES += \ rpm/sapd.yaml \ -- cgit v1.2.3