Commit d0ce19a9 authored by Laurent Montel's avatar Laurent Montel 😁

Use qt5_add_dbus_interfaces

parent 005cf542
......@@ -46,7 +46,7 @@ set(akonadiconsole_bin_SRCS
qt4_generate_dbus_interface(jobtracker.h org.freedesktop.Akonadi.JobTracker.xml)
qt5_add_dbus_adaptor(akonadiconsole_bin_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Akonadi.JobTracker.xml jobtracker.h JobTracker)
qt4_add_dbus_interfaces(akonadiconsole_bin_SRCS
qt5_add_dbus_interfaces(akonadiconsole_bin_SRCS
${AKONADI_DBUS_INTERFACES_DIR}/org.freedesktop.Akonadi.TracerNotification.xml
)
# Use intalled interface once we can depend on Akoandi 1.1
......
......@@ -114,7 +114,7 @@ set(akregatorpart_PART_SRCS
)
#REACTIVATE
#qt4_add_dbus_interfaces(akregatorpart_PART_SRCS ${KDE4_DBUS_INTERFACES_DIR}/org.kde.KSpeech.xml)
#qt5_add_dbus_interfaces(akregatorpart_PART_SRCS ${KDE4_DBUS_INTERFACES_DIR}/org.kde.KSpeech.xml)
qt5_add_dbus_adaptor(akregatorpart_PART_SRCS org.kde.akregator.part.xml akregator_part.h Akregator::Part)
qt5_wrap_ui(akregatorpart_PART_SRCS
......
......@@ -5,7 +5,7 @@ set(kontact_coisceimplugin_PART_SRCS
coisceim_plugin.cpp
)
qt4_add_dbus_interfaces(kontact_coisceimplugin_PART_SRCS ${CMAKE_BINARY_DIR}/examples/coisceim/org.kde.coisceim.CoisceimWidget.xml)
qt5_add_dbus_interfaces(kontact_coisceimplugin_PART_SRCS ${CMAKE_BINARY_DIR}/examples/coisceim/org.kde.coisceim.CoisceimWidget.xml)
kde4_add_plugin(kontact_coisceimplugin ${kontact_coisceimplugin_PART_SRCS} )
......
......@@ -124,9 +124,9 @@ qt5_wrap_ui(kalarm_bin_SRCS
qt5_add_dbus_adaptor(kalarm_bin_SRCS org.kde.kalarm.kalarm.xml dbushandler.h DBusHandler)
if (KMAIL_SUPPORTED)
qt4_add_dbus_interfaces(kalarm_bin_SRCS ${CMAKE_BINARY_DIR}/kmail/org.kde.kmail.kmail.xml)
qt5_add_dbus_interfaces(kalarm_bin_SRCS ${CMAKE_BINARY_DIR}/kmail/org.kde.kmail.kmail.xml)
endif ()
#REACTIVATE qt4_add_dbus_interfaces(kalarm_bin_SRCS ${KDE4_DBUS_INTERFACES_DIR}/org.kde.KSpeech.xml)
#REACTIVATE qt5_add_dbus_interfaces(kalarm_bin_SRCS ${KDE4_DBUS_INTERFACES_DIR}/org.kde.KSpeech.xml)
kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/kalarmresource.kcfg org.kde.Akonadi.KAlarm.Settings)
qt4_add_dbus_interface(kalarm_bin_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.KAlarm.Settings.xml kalarmsettings KAlarmSettings)
......@@ -134,7 +134,7 @@ qt4_add_dbus_interface(kalarm_bin_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akona
kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/kalarmdirresource.kcfg org.kde.Akonadi.KAlarmDir.Settings)
qt4_add_dbus_interface(kalarm_bin_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.KAlarmDir.Settings.xml kalarmdirsettings KAlarmDirSettings)
qt4_add_dbus_interfaces(kalarm_bin_SRCS ${AKONADI_DBUS_INTERFACES_DIR}/org.freedesktop.Akonadi.Agent.Control.xml)
qt5_add_dbus_interfaces(kalarm_bin_SRCS ${AKONADI_DBUS_INTERFACES_DIR}/org.freedesktop.Akonadi.Agent.Control.xml)
#qt5_add_dbus_adaptor(kalarm_bin_SRCS ${AKONADI_DBUS_INTERFACES_DIR}/org.freedesktop.Akonadi.Agent.Control.xml agentbase.h Akonadi::AgentBase controladaptor Akonadi__ControlAdaptor)
kconfig_add_kcfg_files(kalarm_bin_SRCS GENERATE_MOC kalarmconfig.kcfgc)
......
......@@ -207,17 +207,17 @@ if (KDEPIM_BUILD_DESKTOP)
KMail::MailServiceImpl
)
qt4_add_dbus_interfaces(kmailprivate_LIB_SRCS
qt5_add_dbus_interfaces(kmailprivate_LIB_SRCS
${CMAKE_BINARY_DIR}/kmail/org.kde.kmail.kmail.xml
)
qt4_add_dbus_interfaces(kmailprivate_LIB_SRCS
qt5_add_dbus_interfaces(kmailprivate_LIB_SRCS
${CMAKE_SOURCE_DIR}/agents/archivemailagent/org.freedesktop.Akonadi.ArchiveMailAgent.xml
)
qt4_add_dbus_interfaces(kmailprivate_LIB_SRCS
qt5_add_dbus_interfaces(kmailprivate_LIB_SRCS
${CMAKE_SOURCE_DIR}/agents/sendlateragent/org.freedesktop.Akonadi.SendLaterAgent.xml
)
qt4_add_dbus_interfaces(kmailprivate_LIB_SRCS
qt5_add_dbus_interfaces(kmailprivate_LIB_SRCS
${CMAKE_SOURCE_DIR}/kmail/dbusinterface/org.freedesktop.Akonadi.NewMailNotifier.xml
)
......@@ -309,7 +309,7 @@ if (KDEPIM_BUILD_DESKTOP)
qt5_add_dbus_adaptor(kmailpart_PART_SRCS
${CMAKE_BINARY_DIR}/kmail/org.kde.kmail.kmailpart.xml kmail_part.h KMailPart
)
qt4_add_dbus_interfaces(kmailpart_PART_SRCS ${CMAKE_BINARY_DIR}/kmail/org.kde.kmail.kmailpart.xml)
qt5_add_dbus_interfaces(kmailpart_PART_SRCS ${CMAKE_BINARY_DIR}/kmail/org.kde.kmail.kmailpart.xml)
add_library(kmailpart MODULE ${kmailpart_PART_SRCS})
target_link_libraries(kmailpart
......
......@@ -7,7 +7,7 @@ include_directories(
########### dbus test ###############
set(dbustest_SRCS dbustest.cpp)
qt4_add_dbus_interfaces(dbustest_SRCS ${CMAKE_BINARY_DIR}/kmail/org.kde.kmail.kmail.xml)
qt5_add_dbus_interfaces(dbustest_SRCS ${CMAKE_BINARY_DIR}/kmail/org.kde.kmail.kmail.xml)
kde4_add_executable(dbustest TEST ${dbustest_SRCS})
add_dependencies(dbustest kmail_xml)
target_link_libraries(dbustest ${KDE4_KIO_LIBS})
......@@ -8,7 +8,7 @@ include_directories(
set(kontact_akregator_PART_SRCS akregator_plugin.cpp)
qt4_add_dbus_interfaces(kontact_akregator_PART_SRCS ${CMAKE_SOURCE_DIR}/akregator/src/org.kde.akregator.part.xml)
qt5_add_dbus_interfaces(kontact_akregator_PART_SRCS ${CMAKE_SOURCE_DIR}/akregator/src/org.kde.akregator.part.xml)
add_library(kontact_akregatorplugin MODULE ${kontact_akregator_PART_SRCS})
......
......@@ -5,7 +5,7 @@ set(kontact_kaddressbookplugin_PART_SRCS
kaddressbook_plugin.cpp
)
qt4_add_dbus_interfaces(kontact_kaddressbookplugin_PART_SRCS ${CMAKE_SOURCE_DIR}/kaddressbook/org.kde.kaddressbook.xml)
qt5_add_dbus_interfaces(kontact_kaddressbookplugin_PART_SRCS ${CMAKE_SOURCE_DIR}/kaddressbook/org.kde.kaddressbook.xml)
add_library(kontact_kaddressbookplugin MODULE ${kontact_kaddressbookplugin_PART_SRCS})
......
......@@ -5,7 +5,7 @@ set(kontact_kjotsplugin_PART_SRCS
kjots_plugin.cpp
)
qt4_add_dbus_interfaces(kontact_kjotsplugin_PART_SRCS ${CMAKE_BINARY_DIR}/kjots/org.kde.KJotsWidget.xml)
qt5_add_dbus_interfaces(kontact_kjotsplugin_PART_SRCS ${CMAKE_BINARY_DIR}/kjots/org.kde.KJotsWidget.xml)
add_library(kontact_kjotsplugin MODULE ${kontact_kjotsplugin_PART_SRCS})
......
......@@ -10,7 +10,7 @@ include_directories(
set(interface_SRCS)
set(kontact_kmail_plugins_interface_SRCS ${interface_SRCS})
qt4_add_dbus_interfaces(kontact_kmail_plugins_interface_SRCS ${CMAKE_BINARY_DIR}/kmail/org.kde.kmail.kmail.xml)
qt5_add_dbus_interfaces(kontact_kmail_plugins_interface_SRCS ${CMAKE_BINARY_DIR}/kmail/org.kde.kmail.kmail.xml)
set(kontact_kmailplugin_PART_SRCS kmail_plugin.cpp summarywidget.cpp ${kontact_kmail_plugins_interface_SRCS})
......
......@@ -23,7 +23,7 @@ set(kontact_knotesplugin_PART_SRCS
)
qt5_add_dbus_adaptor(kontact_knotesplugin_PART_SRCS org.kde.kontact.KNotes.xml knotes_part.h KNotesPart)
qt4_add_dbus_interfaces(kontact_knotesplugin_interface_SRCS org.kde.kontact.KNotes.xml)
qt5_add_dbus_interfaces(kontact_knotesplugin_interface_SRCS org.kde.kontact.KNotes.xml)
......
......@@ -8,7 +8,7 @@ set(libcommon_SRCS korg_uniqueapp.cpp)
set(kontact_korganizerplugin_PART_SRCS korganizerplugin.cpp apptsummarywidget.cpp summaryeventinfo.cpp ${libcommon_SRCS})
qt4_add_dbus_interfaces(kontact_korganizerplugin_PART_SRCS ${CMAKE_SOURCE_DIR}/korganizer/org.kde.Korganizer.Calendar.xml ${CMAKE_SOURCE_DIR}/korganizer/org.kde.korganizer.Korganizer.xml)
qt5_add_dbus_interfaces(kontact_korganizerplugin_PART_SRCS ${CMAKE_SOURCE_DIR}/korganizer/org.kde.Korganizer.Calendar.xml ${CMAKE_SOURCE_DIR}/korganizer/org.kde.korganizer.Korganizer.xml)
add_library(kontact_korganizerplugin MODULE ${kontact_korganizerplugin_PART_SRCS})
......@@ -18,7 +18,7 @@ target_link_libraries(kontact_korganizerplugin KF5::AkonadiCalendar KF5::Calenda
set(kontact_todoplugin_PART_SRCS todoplugin.cpp todosummarywidget.cpp ${libcommon_SRCS})
qt4_add_dbus_interfaces(kontact_todoplugin_PART_SRCS ${CMAKE_SOURCE_DIR}/korganizer/org.kde.Korganizer.Calendar.xml ${CMAKE_SOURCE_DIR}/korganizer/org.kde.korganizer.Korganizer.xml)
qt5_add_dbus_interfaces(kontact_todoplugin_PART_SRCS ${CMAKE_SOURCE_DIR}/korganizer/org.kde.Korganizer.Calendar.xml ${CMAKE_SOURCE_DIR}/korganizer/org.kde.korganizer.Korganizer.xml)
add_library(kontact_todoplugin MODULE ${kontact_todoplugin_PART_SRCS})
......@@ -28,7 +28,7 @@ target_link_libraries(kontact_todoplugin KF5::AkonadiCalendar KF5::Abc kdepim K
set(kontact_journalplugin_PART_SRCS journalplugin.cpp ${libcommon_SRCS})
qt4_add_dbus_interfaces(kontact_journalplugin_PART_SRCS ${CMAKE_SOURCE_DIR}/korganizer/org.kde.Korganizer.Calendar.xml)
qt5_add_dbus_interfaces(kontact_journalplugin_PART_SRCS ${CMAKE_SOURCE_DIR}/korganizer/org.kde.Korganizer.Calendar.xml)
add_library(kontact_journalplugin MODULE ${kontact_journalplugin_PART_SRCS})
......
......@@ -7,7 +7,7 @@ set(kontact_summaryplugin_PART_SRCS summaryview_plugin.cpp summaryview_part.cpp
qt4_add_resources(kontact_summaryplugin_PART_SRCS summaryview.qrc)
if(KMAIL_SUPPORTED)
qt4_add_dbus_interfaces(kontact_summaryplugin_PART_SRCS ${CMAKE_BINARY_DIR}/kmail/org.kde.kmail.kmail.xml)
qt5_add_dbus_interfaces(kontact_summaryplugin_PART_SRCS ${CMAKE_BINARY_DIR}/kmail/org.kde.kmail.kmail.xml)
endif()
add_library(kontact_summaryplugin MODULE ${kontact_summaryplugin_PART_SRCS})
......
......@@ -236,15 +236,15 @@ set(korganizerprivate_LIB_SRCS
ActionManager calendaradaptor KOrgCalendarAdaptor
)
qt4_add_dbus_interfaces(korganizerprivate_LIB_SRCS
qt5_add_dbus_interfaces(korganizerprivate_LIB_SRCS
org.kde.korganizer.Korganizer.xml
)
qt4_add_dbus_interfaces(korganizerprivate_LIB_SRCS
qt5_add_dbus_interfaces(korganizerprivate_LIB_SRCS
${CMAKE_SOURCE_DIR}/korgac/org.kde.korganizer.KOrgac.xml
)
qt4_add_dbus_interfaces(korganizerprivate_LIB_SRCS
qt5_add_dbus_interfaces(korganizerprivate_LIB_SRCS
${CMAKE_SOURCE_DIR}/korganizer/org.kde.korganizer.Korganizer.xml
)
......
......@@ -6,7 +6,7 @@ if(KMAIL_SUPPORTED)
set( ksendemail_SRCS main.cpp mailerservice.cpp )
qt4_add_dbus_interfaces( ksendemail_SRCS ${CMAKE_BINARY_DIR}/kmail/org.kde.kmail.kmail.xml )
qt5_add_dbus_interfaces( ksendemail_SRCS ${CMAKE_BINARY_DIR}/kmail/org.kde.kmail.kmail.xml )
add_executable( ksendemail ${ksendemail_SRCS})
add_dependencies( ksendemail kmail_xml )
......
......@@ -16,9 +16,9 @@ set(kdepimdbusinterfaces_LIB_SRCS
)
qt4_generate_dbus_interface(${CMAKE_SOURCE_DIR}/kmail/kmkernel.h org.kde.kmail.kmail.xml OPTIONS -a)
qt4_add_dbus_interfaces( kdepimdbusinterfaces_LIB_SRCS ${CMAKE_SOURCE_DIR}/korgac/org.kde.korganizer.KOrgac.xml)
qt4_add_dbus_interfaces( kdepimdbusinterfaces_LIB_SRCS ${CMAKE_SOURCE_DIR}/korganizer/org.kde.korganizer.Korganizer.xml)
qt4_add_dbus_interfaces( kdepimdbusinterfaces_LIB_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kmail.kmail.xml)
qt5_add_dbus_interfaces( kdepimdbusinterfaces_LIB_SRCS ${CMAKE_SOURCE_DIR}/korgac/org.kde.korganizer.KOrgac.xml)
qt5_add_dbus_interfaces( kdepimdbusinterfaces_LIB_SRCS ${CMAKE_SOURCE_DIR}/korganizer/org.kde.korganizer.Korganizer.xml)
qt5_add_dbus_interfaces( kdepimdbusinterfaces_LIB_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kmail.kmail.xml)
add_library(kdepimdbusinterfaces ${LIBRARY_TYPE} ${kdepimdbusinterfaces_LIB_SRCS})
......
......@@ -165,7 +165,7 @@ kconfig_add_kcfg_files(libmailcommon_SRCS
set_source_files_properties(${CMAKE_SOURCE_DIR}/agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml PROPERTIES INCLUDE "dbusoperators.h")
qt4_add_dbus_interfaces(libmailcommon_SRCS
qt5_add_dbus_interfaces(libmailcommon_SRCS
${CMAKE_SOURCE_DIR}/agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml
)
......@@ -184,7 +184,7 @@ endmacro()
add_resource_iface(settings.kcfg org.kde.Akonadi.POP3.Settings Pop3Settings)
qt4_add_dbus_interfaces(libmailcommon_SRCS
qt5_add_dbus_interfaces(libmailcommon_SRCS
${CMAKE_SOURCE_DIR}/korganizer/org.kde.Korganizer.Calendar.xml
)
......
......@@ -21,7 +21,7 @@ install(TARGETS messageviewer_bodypartformatter_text_vcard DESTINATION ${PLUGIN_
set(messageviewer_bodypartformatter_text_calendar_PART_SRCS text_calendar.cpp delegateselector.cpp attendeeselector.cpp memorycalendarmemento.cpp syncitiphandler.cpp)
qt4_add_dbus_interfaces(messageviewer_bodypartformatter_text_calendar_PART_SRCS
qt5_add_dbus_interfaces(messageviewer_bodypartformatter_text_calendar_PART_SRCS
${CMAKE_SOURCE_DIR}/korganizer/org.kde.Korganizer.Calendar.xml
)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment