napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

keyboard: adapt to Qt6

Browse Source
This commit is contained in:
Adriaan de Groot 2023-09-04 23:55:18 +02:00
parent 6ffafe1c45
commit 93e9990df8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/keyboard/CMakeLists.txt
View File

@ -21,7 +21,7 @@ calamares_add_plugin(keyboard
keyboard.qrc keyboard.qrc
SHARED_LIB SHARED_LIB
LINK_LIBRARIES LINK_LIBRARIES
Qt5::DBus ${qtname}::DBus
) )
calamares_add_test(keyboardtest SOURCES Tests.cpp SetKeyboardLayoutJob.cpp RESOURCES keyboard.qrc) calamares_add_test(keyboardtest SOURCES Tests.cpp SetKeyboardLayoutJob.cpp RESOURCES keyboard.qrc)

4
src/modules/keyboardq/CMakeLists.txt
View File

@ -8,7 +8,7 @@ if(NOT WITH_QML)
return() return()
endif() endif()
find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED Core DBus) find_package(${qtname} ${QT_VERSION} CONFIG REQUIRED Core DBus)
set(_keyboard ${CMAKE_CURRENT_SOURCE_DIR}/../keyboard) set(_keyboard ${CMAKE_CURRENT_SOURCE_DIR}/../keyboard)
@ -27,5 +27,5 @@ calamares_add_plugin(keyboardq
keyboardq.qrc keyboardq.qrc
SHARED_LIB SHARED_LIB
LINK_LIBRARIES LINK_LIBRARIES
Qt5::DBus ${qtname}::DBus
) )