From b61cf6b28ca10b6baaf80d68013d3231e37a9ef8 Mon Sep 17 00:00:00 2001
From: Richard Liebscher <r1tschy@posteo.de>
Date: Mon, 6 Jan 2020 19:28:36 +0000
Subject: [PATCH] Build DBus interfaces library for SailfishConnect

---
 CMakeLists.txt                  |  4 ++--
 interfaces/CMakeLists.txt       | 32 ++++++++++++++++----------------
 interfaces/dbusinterfaces.cpp   |  4 ++++
 interfaces/remotesinksmodel.cpp |  1 +
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51662bac1..e2dbb908e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,12 +83,12 @@ if(PRIVATE_DBUS_ENABLED OR APPLE)
 endif()
 
 add_subdirectory(core)
+add_subdirectory(plugins)
+add_subdirectory(interfaces)
 
 if (NOT SAILFISHOS)
     add_subdirectory(icon)
-    add_subdirectory(interfaces)
     add_subdirectory(data)
-    add_subdirectory(plugins)
     add_subdirectory(cli)
     add_subdirectory(declarativeplugin)
 
diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
index 22adafeaf..6c71c7cfa 100644
--- a/interfaces/CMakeLists.txt
+++ b/interfaces/CMakeLists.txt
@@ -22,22 +22,22 @@ set(libkdeconnect_SRC
 #    modeltest.cpp
 )
 
-geninterface(${CMAKE_SOURCE_DIR}/core/daemon.h daemoninterface)
-geninterface(${CMAKE_SOURCE_DIR}/core/device.h deviceinterface)
-geninterface(${CMAKE_SOURCE_DIR}/plugins/battery/batterydbusinterface.h devicebatteryinterface)
-geninterface(${CMAKE_SOURCE_DIR}/plugins/sftp/sftpplugin.h devicesftpinterface)
-geninterface(${CMAKE_SOURCE_DIR}/plugins/notifications/notificationsdbusinterface.h devicenotificationsinterface)
-geninterface(${CMAKE_SOURCE_DIR}/plugins/findmyphone/findmyphoneplugin.h devicefindmyphoneinterface)
-geninterface(${CMAKE_SOURCE_DIR}/plugins/notifications/notification.h notificationinterface)
-geninterface(${CMAKE_SOURCE_DIR}/plugins/mprisremote/mprisremoteplugin.h mprisremoteinterface)
-geninterface(${CMAKE_SOURCE_DIR}/plugins/remotecontrol/remotecontrolplugin.h remotecontrolinterface)
-geninterface(${CMAKE_SOURCE_DIR}/plugins/lockdevice/lockdeviceplugin.h lockdeviceinterface)
-geninterface(${CMAKE_SOURCE_DIR}/plugins/remotecommands/remotecommandsplugin.h remotecommandsinterface)
-geninterface(${CMAKE_SOURCE_DIR}/plugins/remotekeyboard/remotekeyboardplugin.h remotekeyboardinterface)
-geninterface(${CMAKE_SOURCE_DIR}/plugins/sms/smsplugin.h smsinterface)
-geninterface(${CMAKE_SOURCE_DIR}/plugins/sms/conversationsdbusinterface.h conversationsinterface)
-geninterface(${CMAKE_SOURCE_DIR}/plugins/share/shareplugin.h shareinterface)
-geninterface(${CMAKE_SOURCE_DIR}/plugins/remotesystemvolume/remotesystemvolumeplugin.h remotesystemvolumeinterface)
+geninterface(${PROJECT_SOURCE_DIR}/core/daemon.h daemoninterface)
+geninterface(${PROJECT_SOURCE_DIR}/core/device.h deviceinterface)
+geninterface(${PROJECT_SOURCE_DIR}/plugins/battery/batterydbusinterface.h devicebatteryinterface)
+geninterface(${PROJECT_SOURCE_DIR}/plugins/sftp/sftpplugin.h devicesftpinterface)
+geninterface(${PROJECT_SOURCE_DIR}/plugins/notifications/notificationsdbusinterface.h devicenotificationsinterface)
+geninterface(${PROJECT_SOURCE_DIR}/plugins/findmyphone/findmyphoneplugin.h devicefindmyphoneinterface)
+geninterface(${PROJECT_SOURCE_DIR}/plugins/notifications/notification.h notificationinterface)
+geninterface(${PROJECT_SOURCE_DIR}/plugins/mprisremote/mprisremoteplugin.h mprisremoteinterface)
+geninterface(${PROJECT_SOURCE_DIR}/plugins/remotecontrol/remotecontrolplugin.h remotecontrolinterface)
+geninterface(${PROJECT_SOURCE_DIR}/plugins/lockdevice/lockdeviceplugin.h lockdeviceinterface)
+geninterface(${PROJECT_SOURCE_DIR}/plugins/remotecommands/remotecommandsplugin.h remotecommandsinterface)
+geninterface(${PROJECT_SOURCE_DIR}/plugins/remotekeyboard/remotekeyboardplugin.h remotekeyboardinterface)
+geninterface(${PROJECT_SOURCE_DIR}/plugins/sms/smsplugin.h smsinterface)
+geninterface(${PROJECT_SOURCE_DIR}/plugins/sms/conversationsdbusinterface.h conversationsinterface)
+geninterface(${PROJECT_SOURCE_DIR}/plugins/share/shareplugin.h shareinterface)
+geninterface(${PROJECT_SOURCE_DIR}/plugins/remotesystemvolume/remotesystemvolumeplugin.h remotesystemvolumeinterface)
 
 add_library(kdeconnectinterfaces SHARED ${libkdeconnect_SRC})
 set_target_properties(kdeconnectinterfaces PROPERTIES
diff --git a/interfaces/dbusinterfaces.cpp b/interfaces/dbusinterfaces.cpp
index 678ac53f0..98f5b3854 100644
--- a/interfaces/dbusinterfaces.cpp
+++ b/interfaces/dbusinterfaces.cpp
@@ -23,10 +23,14 @@
 
 QString DaemonDbusInterface::activatedService() {
     static const QString service = QStringLiteral("org.kde.kdeconnect");
+
+#ifndef SAILFISHOS
     auto reply = DBusHelper::sessionBus().interface()->startService(service);
     if (!reply.isValid()) {
         qWarning() << "error activating kdeconnectd:" << reply.error();
     }
+#endif
+
     return service;
 }
 
diff --git a/interfaces/remotesinksmodel.cpp b/interfaces/remotesinksmodel.cpp
index 4b986b313..82cd228a0 100644
--- a/interfaces/remotesinksmodel.cpp
+++ b/interfaces/remotesinksmodel.cpp
@@ -25,6 +25,7 @@
 #include <QDBusInterface>
 
 #include <dbushelper.h>
+#include <core/qtcompat_p.h>
 
 RemoteSinksModel::RemoteSinksModel(QObject* parent)
     : QAbstractListModel(parent)