From 1d9ea25c2f128ce16b2831e7923420b6d958461d Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@kdab.com>
Date: Thu, 9 May 2019 01:05:23 +0200
Subject: [PATCH] Make PulseAudioQT mandatory

The ci issue has been sorted out

This reverts commit d3b41924b5a840be230008cee1958bf6beebcd20.
---
 CMakeLists.txt         |  2 +-
 plugins/CMakeLists.txt | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 56b541895..323359263 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ else()
     endif()
     set(QCA_MIN_VERSION "2.1.0")
     find_package(Qca-qt5 ${QCA_MIN_VERSION} REQUIRED)
-    find_package(KF5PulseAudioQt)
+    find_package(KF5PulseAudioQt REQUIRED)
     add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_NO_KEYWORDS)
 endif()
 
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 6426c42f2..ed5652b7e 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -7,6 +7,7 @@ add_subdirectory(battery)
 add_subdirectory(sendnotifications)
 add_subdirectory(mpriscontrol)
 add_subdirectory(photo)
+add_subdirectory(systemvolume)
 
 if(NOT SAILFISHOS)
     add_subdirectory(clipboard)
@@ -22,6 +23,7 @@ if(NOT SAILFISHOS)
     if(NOT WIN32)
         add_subdirectory(screensaver-inhibit)
         add_subdirectory(sftp)
+        add_subdirectory(pausemusic)
     endif()
 
     if(Qt5Multimedia_FOUND)
@@ -37,12 +39,6 @@ if(SAILFISHOS OR EXPERIMENTALAPP_ENABLED)
     add_subdirectory(remotesystemvolume)
 endif()
 
-if(KF5PulseAudioQt_FOUND AND NOT WIN32)
-    add_subdirectory(pausemusic)
-endif()
-
-if(KF5PulseAudioQt_FOUND OR WIN32)
-    add_subdirectory(systemvolume)
-endif()
-
+# If we split notifications per plugin, in several notifyrc files, they won't 
+# appear in the same group in the Notifications KCM
 install(FILES kdeconnect.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})