Revert "Make PulseAudioQT mandatory"
This breaks CI as PAQt is not yet available there
This reverts commit b48596d7c3
.
This commit is contained in:
parent
c18c7b27f1
commit
d3b41924b5
2 changed files with 9 additions and 5 deletions
|
@ -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()
|
||||
|
||||
|
|
|
@ -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})
|
||||
|
|
Loading…
Reference in a new issue