From 384e727b89627fdb381500be29fc3880493ed634 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 8 Nov 2021 12:30:56 +0100 Subject: Rename com.ubuntu.AccountsService.Sound --- tests/service-mocks/accounts-mock/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/service-mocks/accounts-mock/CMakeLists.txt') diff --git a/tests/service-mocks/accounts-mock/CMakeLists.txt b/tests/service-mocks/accounts-mock/CMakeLists.txt index 421e155..e737a07 100644 --- a/tests/service-mocks/accounts-mock/CMakeLists.txt +++ b/tests/service-mocks/accounts-mock/CMakeLists.txt @@ -7,9 +7,9 @@ include_directories(${Qt5DBus_INCLUDE_DIRS} add_definitions(-DQT_NO_KEYWORDS=1) -if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Sound.xml") +if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") add_definitions(-DHAS_UT_ACCTSERVICE_SOUND_SETTINGS) - set(dbusinterface_sound_xml "com.ubuntu.AccountsService.Sound.Mock.xml") + set(dbusinterface_sound_xml "com.lomiri.AccountsService.Sound.Mock.xml") else() set(dbusinterface_sound_xml "org.ayatana.AccountsService.Sound.Mock.xml") endif() -- cgit v1.2.3 From 240aadeb1ae8dcbf06f618ffb51342f81f7f77db Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 3 Nov 2021 21:54:40 +0100 Subject: Rename HAS_UT_ACCTSERVICE_SOUND_SETTINGS --- tests/service-mocks/accounts-mock/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/service-mocks/accounts-mock/CMakeLists.txt') diff --git a/tests/service-mocks/accounts-mock/CMakeLists.txt b/tests/service-mocks/accounts-mock/CMakeLists.txt index e737a07..bcb9608 100644 --- a/tests/service-mocks/accounts-mock/CMakeLists.txt +++ b/tests/service-mocks/accounts-mock/CMakeLists.txt @@ -8,7 +8,7 @@ include_directories(${Qt5DBus_INCLUDE_DIRS} add_definitions(-DQT_NO_KEYWORDS=1) if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") - add_definitions(-DHAS_UT_ACCTSERVICE_SOUND_SETTINGS) + add_definitions(-DHAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS) set(dbusinterface_sound_xml "com.lomiri.AccountsService.Sound.Mock.xml") else() set(dbusinterface_sound_xml "org.ayatana.AccountsService.Sound.Mock.xml") -- cgit v1.2.3 From 6c745ba6709b7567d3929046bb9ecd9797048e70 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 3 Nov 2021 22:13:55 +0100 Subject: Use 'ayatana' namespace for unit tests. --- tests/service-mocks/accounts-mock/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/service-mocks/accounts-mock/CMakeLists.txt') diff --git a/tests/service-mocks/accounts-mock/CMakeLists.txt b/tests/service-mocks/accounts-mock/CMakeLists.txt index bcb9608..1549249 100644 --- a/tests/service-mocks/accounts-mock/CMakeLists.txt +++ b/tests/service-mocks/accounts-mock/CMakeLists.txt @@ -22,13 +22,13 @@ qt5_add_dbus_interface(interface_files ${dbusinterface_sound_xml} accountsservic qt5_add_dbus_adaptor(adaptor_files ${dbusinterface_sound_xml} AccountsServiceSoundMock.h - ubuntu::indicators::testing::AccountsServiceSoundMock + ayatana::indicators::testing::AccountsServiceSoundMock AccountsServiceSoundMockAdaptor) qt5_add_dbus_adaptor(adaptor_files ${CMAKE_SOURCE_DIR}/tests/dbus-types/org.freedesktop.Accounts.xml AccountsMock.h - ubuntu::indicators::testing::AccountsMock + ayatana::indicators::testing::AccountsMock AccountsMockAdaptor) add_executable( -- cgit v1.2.3