From 62feb25f5c66625ae0e1fa15364d2582496e9d15 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sat, 7 Jul 2018 22:45:06 +0200 Subject: [PATCH] Remove obsolete qt_add_dbus_adaptor macro --- CMakeLists.txt | 6 ------ src/infoplugins/linux/CMakeLists.txt | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f584b9855..641be0490 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -188,12 +188,6 @@ endif() find_package(Qt5LinguistTools REQUIRED) -if( UNIX AND NOT APPLE ) - macro(qt_add_dbus_adaptor) - qt5_add_dbus_adaptor(${ARGN}) - endmacro() -endif() - macro(setup_qt) endmacro() diff --git a/src/infoplugins/linux/CMakeLists.txt b/src/infoplugins/linux/CMakeLists.txt index 85616b122..8730b62f0 100644 --- a/src/infoplugins/linux/CMakeLists.txt +++ b/src/infoplugins/linux/CMakeLists.txt @@ -16,9 +16,9 @@ SET(mpris_srcs mpris/MprisPlugin.cpp ) -qt_add_dbus_adaptor(mpris_srcs mpris/MprisPluginRootAdaptor.xml +qt5_add_dbus_adaptor(mpris_srcs mpris/MprisPluginRootAdaptor.xml mpris/MprisPlugin.h Tomahawk::InfoSystem::MprisPlugin MprisPluginRootAdaptor MprisPluginRootAdaptor) -qt_add_dbus_adaptor(mpris_srcs mpris/MprisPluginPlayerAdaptor.xml +qt5_add_dbus_adaptor(mpris_srcs mpris/MprisPluginPlayerAdaptor.xml mpris/MprisPlugin.h Tomahawk::InfoSystem::MprisPlugin MprisPluginPlayerAdaptor MprisPluginPlayerAdaptor) tomahawk_add_plugin(mpris