1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-16 11:04:01 +02:00

Build D-Bus interfaces with Qt5

This commit is contained in:
Uwe L. Korn
2013-07-03 22:28:14 +02:00
parent 6c23c4d660
commit fd862e2265
4 changed files with 21 additions and 5 deletions

View File

@@ -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)

View File

@@ -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

View File

@@ -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" )

View File

@@ -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 )