keyboard: adapt to Qt6

2023-09-04 23:55:18 +02:00 · 2023-09-04 23:55:18 +02:00 · 93e9990df8
commit 93e9990df8
parent 6ffafe1c45
2 changed files with 3 additions and 3 deletions
--- a/src/modules/keyboard/CMakeLists.txt
+++ b/src/modules/keyboard/CMakeLists.txt
@ -21,7 +21,7 @@ calamares_add_plugin(keyboard
        keyboard.qrc
    SHARED_LIB
    LINK_LIBRARIES
-        Qt5::DBus
+        ${qtname}::DBus
 )

 calamares_add_test(keyboardtest SOURCES Tests.cpp SetKeyboardLayoutJob.cpp RESOURCES keyboard.qrc)
--- a/src/modules/keyboardq/CMakeLists.txt
+++ b/src/modules/keyboardq/CMakeLists.txt
@ -8,7 +8,7 @@ if(NOT WITH_QML)
    return()
 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)

@ -27,5 +27,5 @@ calamares_add_plugin(keyboardq
        keyboardq.qrc
    SHARED_LIB
    LINK_LIBRARIES
-        Qt5::DBus
+        ${qtname}::DBus
 )