diff --git a/CMakeLists.txt b/CMakeLists.txt index d16fdf086..116c3367f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -130,6 +130,14 @@ if( NOT BUILD_WITH_QT4 ) qt5_add_translation(${ARGN}) endmacro() + macro(qt_add_dbus_interface) + qt5_add_dbus_interface(${ARGN}) + endmacro() + + macro(qt_add_dbus_adaptor) + qt5_add_dbus_adaptor(${ARGN}) + endmacro() + macro(setup_qt) endmacro() @@ -168,6 +176,14 @@ if( NOT Qt5Core_DIR ) qt4_add_translation(${ARGN}) endmacro() + macro(qt_add_dbus_interface) + qt4_add_dbus_interface(${ARGN}) + endmacro() + + macro(qt_add_dbus_adaptor) + qt4_add_dbus_adaptor(${ARGN}) + endmacro() + macro(setup_qt) if( NOT BUILD_GUI ) set(QT_DONT_USE_QTGUI TRUE) diff --git a/src/infoplugins/linux/CMakeLists.txt b/src/infoplugins/linux/CMakeLists.txt index 7e02fa288..083eae697 100644 --- a/src/infoplugins/linux/CMakeLists.txt +++ b/src/infoplugins/linux/CMakeLists.txt @@ -9,7 +9,7 @@ if(NOT Qt5Core_DIR) ${THIRDPARTY_DIR}/libqnetwm/libqnetwm/netwm.cpp ) SET(FDO_LINK_LIBRARIES ${LINK_LIBRARIES} ${X11_LIBRARIES}) - qt4_add_dbus_interface(fdo_srcs fdonotify/org.freedesktop.Notifications.xml + qt_add_dbus_interface(fdo_srcs fdonotify/org.freedesktop.Notifications.xml FreedesktopNotificationsProxy) tomahawk_add_plugin(fdonotify @@ -25,9 +25,9 @@ SET(mpris_srcs mpris/MprisPlugin.cpp ) -qt4_add_dbus_adaptor(mpris_srcs mpris/MprisPluginRootAdaptor.xml +qt_add_dbus_adaptor(mpris_srcs mpris/MprisPluginRootAdaptor.xml mpris/MprisPlugin.h Tomahawk::InfoSystem::MprisPlugin MprisPluginRootAdaptor MprisPluginRootAdaptor) -qt4_add_dbus_adaptor(mpris_srcs mpris/MprisPluginPlayerAdaptor.xml +qt_add_dbus_adaptor(mpris_srcs mpris/MprisPluginPlayerAdaptor.xml mpris/MprisPlugin.h Tomahawk::InfoSystem::MprisPlugin MprisPluginPlayerAdaptor MprisPluginPlayerAdaptor) tomahawk_add_plugin(mpris diff --git a/src/tomahawk/CMakeLists.linux.cmake b/src/tomahawk/CMakeLists.linux.cmake index 30f0ee538..ccad7548d 100644 --- a/src/tomahawk/CMakeLists.linux.cmake +++ b/src/tomahawk/CMakeLists.linux.cmake @@ -6,7 +6,7 @@ FOREACH( _file ${_icons} ) ENDFOREACH( _file ) IF( WITH_UPOWER ) - QT4_ADD_DBUS_INTERFACE(tomahawkSources "${CMAKE_CURRENT_SOURCE_DIR}/linux/org.freedesktop.UPower.xml" linux/UPowerProxy) + qt_add_dbus_interface(tomahawkSources "${CMAKE_CURRENT_SOURCE_DIR}/linux/org.freedesktop.UPower.xml" linux/UPowerProxy) ENDIF( WITH_UPOWER ) ADD_SUBDIRECTORY( "${CMAKE_CURRENT_SOURCE_DIR}/linux" ) diff --git a/src/tomahawk/CMakeLists.txt b/src/tomahawk/CMakeLists.txt index c0967ff3f..6dfffc590 100644 --- a/src/tomahawk/CMakeLists.txt +++ b/src/tomahawk/CMakeLists.txt @@ -28,7 +28,7 @@ SET( tomahawkSources ${tomahawkSources} IF( WITH_GNOMESHORTCUTHANDLER ) SET( tomahawkSources ${tomahawkSources} GnomeShortcutHandler.cpp ) - qt4_add_dbus_interface(tomahawkSources GnomeSettingsDaemonMediaKeys.xml GnomeSettingsDaemonMediaKeysProxy) + qt_add_dbus_interface(tomahawkSources GnomeSettingsDaemonMediaKeys.xml GnomeSettingsDaemonMediaKeysProxy) ENDIF( WITH_GNOMESHORTCUTHANDLER ) IF( LIBLASTFM_FOUND )