Qt6 build system fixes

Two recent changes and one issue initially missed.
4 years ago · 34857ed1ec
parent 241c6976c3
commit 34857ed1ec
2 changed files with 3 additions and 3 deletions
--- a/kcms/colors/CMakeLists.txt
+++ b/kcms/colors/CMakeLists.txt
@ -9,7 +9,7 @@ set(kcm_colors_SRCS
    filterproxymodel.cpp
 )

-qt5_generate_dbus_interface(
+qt_generate_dbus_interface(
    accentColorService/accentColorService.h
    org.kde.plasmashell.accentColor.xml
    OPTIONS -M
@ -29,7 +29,7 @@ set(plasma-accentcolor-service_SRCS
    ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasmashell.accentColor.xml
 )

-qt5_add_dbus_adaptor(plasma-accentcolor-service_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasmashell.accentColor.xml
+qt_add_dbus_adaptor(plasma-accentcolor-service_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasmashell.accentColor.xml
                     accentColorService/accentColorService.h AccentColorService
                     accentcolor_service_adaptor AccentColorServiceAdaptor)

--- a/libkworkspace/LibKWorkspaceConfig.cmake.in
+++ b/libkworkspace/LibKWorkspaceConfig.cmake.in
@ -1,6 +1,6 @@
@PACKAGE_INIT@

 include(CMakeFindDependencyMacro)
-find_dependency(Qt5Core "@QT_MIN_VERSION@")
+find_dependency(Qt@QT_MAJOR_VERSION@Core "@QT_MIN_VERSION@")

 include("${CMAKE_CURRENT_LIST_DIR}/LibKWorkspaceLibraryTargets.cmake")