Fix build with current Qt and XCB

main
Reion Wong 4 weeks ago
parent 4a4e9f471c
commit e0ff25d31f

@ -60,4 +60,9 @@ void Application::onPressed(QKeySequence keySeq)
if (keySeq.toString() == "") {
QProcess::startDetached("cutefish-launcher", QStringList());
}
}
}
void Application::onReleased(QKeySequence keySeq)
{
Q_UNUSED(keySeq);
}

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

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

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

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

Loading…
Cancel
Save