From d3b41924b5a840be230008cee1958bf6beebcd20 Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Wed, 1 May 2019 14:53:30 +0200 Subject: [PATCH] Revert "Make PulseAudioQT mandatory" This breaks CI as PAQt is not yet available there This reverts commit b48596d7c361008477cdb0d86b8ed34bdc056c56. --- CMakeLists.txt | 2 +- plugins/CMakeLists.txt | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 323359263..56b541895 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 REQUIRED) + find_package(KF5PulseAudioQt) add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_NO_KEYWORDS) endif() diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index ed5652b7e..6426c42f2 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -7,7 +7,6 @@ add_subdirectory(battery) add_subdirectory(sendnotifications) add_subdirectory(mpriscontrol) add_subdirectory(photo) -add_subdirectory(systemvolume) if(NOT SAILFISHOS) add_subdirectory(clipboard) @@ -23,7 +22,6 @@ if(NOT SAILFISHOS) if(NOT WIN32) add_subdirectory(screensaver-inhibit) add_subdirectory(sftp) - add_subdirectory(pausemusic) endif() if(Qt5Multimedia_FOUND) @@ -39,6 +37,12 @@ if(SAILFISHOS OR EXPERIMENTALAPP_ENABLED) add_subdirectory(remotesystemvolume) endif() -# If we split notifications per plugin, in several notifyrc files, they won't -# appear in the same group in the Notifications KCM +if(KF5PulseAudioQt_FOUND AND NOT WIN32) + add_subdirectory(pausemusic) +endif() + +if(KF5PulseAudioQt_FOUND OR WIN32) + add_subdirectory(systemvolume) +endif() + install(FILES kdeconnect.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})