From eb1f30cb1056e78360f205697dfb489867bec2e5 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 13 Jan 2018 13:17:06 +0100 Subject: tests/service-mocks/accounts-mock: Re-add com.ubuntu.AccountsService.Sound.Mock.xml and use it for testing this project on Ubuntu. --- tests/service-mocks/accounts-mock/CMakeLists.txt | 8 +++++--- .../accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml | 8 ++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml (limited to 'tests/service-mocks') diff --git a/tests/service-mocks/accounts-mock/CMakeLists.txt b/tests/service-mocks/accounts-mock/CMakeLists.txt index ee06146..18f5084 100644 --- a/tests/service-mocks/accounts-mock/CMakeLists.txt +++ b/tests/service-mocks/accounts-mock/CMakeLists.txt @@ -5,13 +5,15 @@ find_package(Qt5DBus REQUIRED) include_directories(${Qt5DBus_INCLUDE_DIRS} "${CMAKE_SOURCE_DIR}/tests/service-mocks") +add_definitions(-DQT_NO_KEYWORDS=1) + if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.SecurityPrivacy.xml") add_definitions(-DHAS_UT_ACCTSERVICE_SOUND_SETTINGS) + set(dbusinterface_sound_xml "com.ubuntu.AccountsService.Sound.Mock.xml") +else() + set(dbusinterface_sound_xml "org.ayatana.AccountsService.Sound.Mock.xml") endif() -add_definitions(-DQT_NO_KEYWORDS=1) - -set(dbusinterface_sound_xml "org.ayatana.AccountsService.Sound.Mock.xml") set_source_files_properties(${dbusinterface_sound_xml} PROPERTIES CLASSNAME AccountsServiceSoundMockInterface) diff --git a/tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml b/tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml new file mode 100644 index 0000000..da9e8aa --- /dev/null +++ b/tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml @@ -0,0 +1,8 @@ + + + + + + + + -- cgit v1.2.3