From e0ff25d31f13037d77c76f3cff44b9ba8abe653b Mon Sep 17 00:00:00 2001 From: Reion Wong Date: Sat, 29 Aug 2026 20:38:42 -0400 Subject: [PATCH] Fix build with current Qt and XCB --- chotkeys/application.cpp | 7 ++++++- notificationd/CMakeLists.txt | 2 +- polkit-agent/CMakeLists.txt | 2 +- settings-daemon/CMakeLists.txt | 7 ++++--- shutdown-ui/CMakeLists.txt | 2 +- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/chotkeys/application.cpp b/chotkeys/application.cpp index 5e816bc..9196141 100644 --- a/chotkeys/application.cpp +++ b/chotkeys/application.cpp @@ -60,4 +60,9 @@ void Application::onPressed(QKeySequence keySeq) if (keySeq.toString() == "Ʇ") { QProcess::startDetached("cutefish-launcher", QStringList()); } -} \ No newline at end of file +} + +void Application::onReleased(QKeySequence keySeq) +{ + Q_UNUSED(keySeq); +} diff --git a/notificationd/CMakeLists.txt b/notificationd/CMakeLists.txt index 6e7f6d0..3762ae0 100644 --- a/notificationd/CMakeLists.txt +++ b/notificationd/CMakeLists.txt @@ -38,7 +38,7 @@ install(TARGETS cutefish-notificationd ) file(GLOB TS_FILES translations/*.ts) -qt5_create_translation(QM_FILES ${TS_FILES}) +qt5_add_translation(QM_FILES ${TS_FILES}) add_custom_target(notificationd_translations DEPENDS ${QM_FILES} SOURCES ${TS_FILES}) add_dependencies(cutefish-notificationd notificationd_translations) diff --git a/polkit-agent/CMakeLists.txt b/polkit-agent/CMakeLists.txt index f888e47..a70f9d7 100644 --- a/polkit-agent/CMakeLists.txt +++ b/polkit-agent/CMakeLists.txt @@ -30,7 +30,7 @@ target_link_libraries(cutefish-polkit-agent ) file(GLOB TS_FILES translations/*.ts) -qt5_create_translation(QM_FILES ${TS_FILES}) +qt5_add_translation(QM_FILES ${TS_FILES}) add_custom_target(polkit-agent-translations DEPENDS ${QM_FILES} SOURCES ${TS_FILES}) add_dependencies(cutefish-polkit-agent polkit-agent-translations) diff --git a/settings-daemon/CMakeLists.txt b/settings-daemon/CMakeLists.txt index 47c71c7..cf415ef 100644 --- a/settings-daemon/CMakeLists.txt +++ b/settings-daemon/CMakeLists.txt @@ -3,7 +3,7 @@ set(TARGET cutefish-settings-daemon) find_package(X11 REQUIRED) find_package(X11_XCB REQUIRED) -find_package(XCB REQUIRED) +find_package(XCB REQUIRED COMPONENTS XCB RECORD) pkg_check_modules(XORGLIBINPUT xorg-libinput IMPORTED_TARGET) pkg_check_modules(XORGSERVER xorg-server IMPORTED_TARGET) @@ -71,14 +71,15 @@ target_link_libraries(${TARGET} X11::X11 X11::Xi X11::XCB - ${XCB_LIBRARIES} + XCB::XCB + XCB::RECORD PkgConfig::XORGLIBINPUT PkgConfig::XORGSERVER PkgConfig::SYNAPTICS ) file(GLOB TS_FILES translations/*.ts) -qt5_create_translation(QM_FILES ${TS_FILES}) +qt5_add_translation(QM_FILES ${TS_FILES}) add_custom_target(translations DEPENDS ${QM_FILES} SOURCES ${TS_FILES}) add_dependencies(${TARGET} translations) diff --git a/shutdown-ui/CMakeLists.txt b/shutdown-ui/CMakeLists.txt index cf1193e..39b7faf 100644 --- a/shutdown-ui/CMakeLists.txt +++ b/shutdown-ui/CMakeLists.txt @@ -15,7 +15,7 @@ target_link_libraries(cutefish-shutdown ) file(GLOB TS_FILES translations/*.ts) -qt5_create_translation(QM_FILES ${TS_FILES}) +qt5_add_translation(QM_FILES ${TS_FILES}) add_custom_target(shutdown-translations DEPENDS ${QM_FILES} SOURCES ${TS_FILES}) add_dependencies(cutefish-shutdown shutdown-translations) install(FILES ${QM_FILES} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cutefish-shutdown/translations)