Commit dac46928 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

GIT_SILENT: use qt_ macro so it will help us to build against qt5/qt6

parent 4810191e
Pipeline #61010 canceled with stage
......@@ -29,16 +29,16 @@ set(korgac_SRCS
set(korganizer_xml ../src/data/org.kde.korganizer.Korganizer.xml)
qt5_add_dbus_interface(korgac_SRCS ${korganizer_xml}
qt_add_dbus_interface(korgac_SRCS ${korganizer_xml}
korganizer_interface
)
qt5_add_dbus_adaptor(korgac_SRCS org.kde.korganizer.KOrgac.xml koalarmclient.h
qt_add_dbus_adaptor(korgac_SRCS org.kde.korganizer.KOrgac.xml koalarmclient.h
KOAlarmClient
)
qt5_add_dbus_interface(korgac_SRCS org.freedesktop.Notifications.xml notifications_interface)
qt5_add_dbus_interface(korgac_SRCS org.freedesktop.DBus.Properties.xml dbusproperties)
qt_add_dbus_interface(korgac_SRCS org.freedesktop.Notifications.xml notifications_interface)
qt_add_dbus_interface(korgac_SRCS org.freedesktop.DBus.Properties.xml dbusproperties)
file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pixmaps/*-apps-korgac.png")
ecm_add_app_icon(korgac_SRCS ICONS ${ICONS_SRCS})
......
......@@ -15,12 +15,12 @@ set(testalarmdlg_SRCS
../mailclient.cpp
${korganizer_BINARY_DIR}/korgac/koalarmclient_debug.cpp)
qt5_add_dbus_interface(testalarmdlg_SRCS ${korganizer_xml}
qt_add_dbus_interface(testalarmdlg_SRCS ${korganizer_xml}
korganizer_interface
)
qt5_add_dbus_interface(testalarmdlg_SRCS ../org.freedesktop.Notifications.xml notifications_interface)
qt5_add_dbus_interface(testalarmdlg_SRCS ../org.freedesktop.DBus.Properties.xml dbusproperties)
qt_add_dbus_interface(testalarmdlg_SRCS ../org.freedesktop.Notifications.xml notifications_interface)
qt_add_dbus_interface(testalarmdlg_SRCS ../org.freedesktop.DBus.Properties.xml dbusproperties)
add_executable(testalarmdlg ${testalarmdlg_SRCS})
......
......@@ -233,25 +233,25 @@ ki18n_wrap_ui(korganizerprivate_LIB_SRCS
views/collectionview/quickview.ui
)
qt5_add_dbus_adaptor(korganizerprivate_LIB_SRCS
qt_add_dbus_adaptor(korganizerprivate_LIB_SRCS
data/org.kde.korganizer.Korganizer.xml impl/korganizerifaceimpl.h
KOrganizerIfaceImpl
)
qt5_add_dbus_adaptor(korganizerprivate_LIB_SRCS
qt_add_dbus_adaptor(korganizerprivate_LIB_SRCS
data/org.kde.Korganizer.Calendar.xml actionmanager.h
ActionManager calendaradaptor KOrgCalendarAdaptor
)
qt5_add_dbus_interfaces(korganizerprivate_LIB_SRCS
qt_add_dbus_interfaces(korganizerprivate_LIB_SRCS
data/org.kde.korganizer.Korganizer.xml
)
qt5_add_dbus_interfaces(korganizerprivate_LIB_SRCS
qt_add_dbus_interfaces(korganizerprivate_LIB_SRCS
../korgac/org.kde.korganizer.KOrgac.xml
)
qt5_add_dbus_interfaces(korganizerprivate_LIB_SRCS
qt_add_dbus_interfaces(korganizerprivate_LIB_SRCS
${korganizer_SOURCE_DIR}/src/data/org.kde.korganizer.Korganizer.xml
)
......
......@@ -9,7 +9,7 @@ ecm_qt_declare_logging_category(libcommon_SRCS HEADER korganizerplugin_debug.h I
set(kontact_korganizerplugin_PART_SRCS korganizerplugin.cpp apptsummarywidget.cpp summaryeventinfo.cpp ${libcommon_SRCS})
qt5_add_dbus_interfaces(kontact_korganizerplugin_PART_SRCS ${korganizer_SOURCE_DIR}/src/data/org.kde.Korganizer.Calendar.xml ${korganizer_SOURCE_DIR}/src/data/org.kde.korganizer.Korganizer.xml)
qt_add_dbus_interfaces(kontact_korganizerplugin_PART_SRCS ${korganizer_SOURCE_DIR}/src/data/org.kde.Korganizer.Calendar.xml ${korganizer_SOURCE_DIR}/src/data/org.kde.korganizer.Korganizer.xml)
add_library(kontact_korganizerplugin MODULE ${kontact_korganizerplugin_PART_SRCS})
......@@ -21,7 +21,7 @@ kcoreaddons_desktop_to_json(kontact_korganizerplugin korganizerplugin.desktop)
set(kontact_todoplugin_PART_SRCS todoplugin.cpp todosummarywidget.cpp ${libcommon_SRCS})
qt5_add_dbus_interfaces(kontact_todoplugin_PART_SRCS ${korganizer_SOURCE_DIR}/src/data/org.kde.Korganizer.Calendar.xml ${korganizer_SOURCE_DIR}/src/data/org.kde.korganizer.Korganizer.xml)
qt_add_dbus_interfaces(kontact_todoplugin_PART_SRCS ${korganizer_SOURCE_DIR}/src/data/org.kde.Korganizer.Calendar.xml ${korganizer_SOURCE_DIR}/src/data/org.kde.korganizer.Korganizer.xml)
add_library(kontact_todoplugin MODULE ${kontact_todoplugin_PART_SRCS})
......@@ -33,7 +33,7 @@ kcoreaddons_desktop_to_json(kontact_todoplugin todoplugin.desktop)
set(kontact_journalplugin_PART_SRCS journalplugin.cpp ${libcommon_SRCS})
qt5_add_dbus_interfaces(kontact_journalplugin_PART_SRCS ${korganizer_SOURCE_DIR}/src/data/org.kde.Korganizer.Calendar.xml)
qt_add_dbus_interfaces(kontact_journalplugin_PART_SRCS ${korganizer_SOURCE_DIR}/src/data/org.kde.Korganizer.Calendar.xml)
add_library(kontact_journalplugin MODULE ${kontact_journalplugin_PART_SRCS})
......
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