Commit a027d2f1 authored by Volker Krause's avatar Volker Krause
Browse files

Fix Qt 6 build of the tablet KCM

parent e9e6fc10
Pipeline #231859 passed with stage
in 3 minutes and 16 seconds
......@@ -40,9 +40,9 @@ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
Svg
Concurrent
)
find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG OPTIONAL_COMPONENTS WaylandClient)
if (QT_MAJOR_VERSION EQUAL "5")
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS X11Extras)
find_package(Qt5 ${QT_MIN_VERSION} CONFIG OPTIONAL_COMPONENTS WaylandClient)
find_package(QtWaylandScanner)
set_package_properties(QtWaylandScanner PROPERTIES
......
......@@ -15,6 +15,7 @@ ecm_qt_declare_logging_category(common_SRCS
EXPORT
kcm_tablet
)
kcoreaddons_add_plugin(kcm_tablet INSTALL_NAMESPACE "plasma/kcms/systemsettings")
if (QT_MAJOR_VERSION EQUAL "5")
ecm_add_qtwayland_client_protocol(common_SRCS
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/tablet/tablet-unstable-v2.xml
......@@ -30,7 +31,6 @@ ecm_qt_install_logging_categories(
)
qt_add_dbus_interface(common_SRCS "${KWIN_INPUTDEVICE_INTERFACE}" InputDevice_interface)
kcoreaddons_add_plugin(kcm_tablet INSTALL_NAMESPACE "plasma/kcms/systemsettings")
kcmutils_generate_desktop_file(kcm_tablet)
target_sources(kcm_tablet PRIVATE
......
Supports Markdown
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