diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9095d4ca5b..8883cc7e06 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,13 +2,11 @@ # SPDX-License-Identifier: CC0-1.0 include: - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml -suse_tumbleweed_qt515_reduced_featureset: - extends: suse_tumbleweed_qt515 +suse_tumbleweed_qt64_reduced_featureset: + extends: suse_tumbleweed_qt64 script: - git config --global --add safe.directory $CI_PROJECT_DIR - python3 -u ci-utilities/run-ci-build.py --project $CI_PROJECT_NAME --branch $CI_COMMIT_REF_NAME --platform Linux --extra-cmake-args="-DKWIN_BUILD_KCMS=OFF -DKWIN_BUILD_SCREENLOCKER=OFF -DKWIN_BUILD_TABBOX=OFF -DKWIN_BUILD_ACTIVITIES=OFF -DKWIN_BUILD_RUNNERS=OFF -DKWIN_BUILD_NOTIFICATIONS=OFF" --skip-publishing diff --git a/.kde-ci.yml b/.kde-ci.yml index 4eb3823006..e834c1d404 100644 --- a/.kde-ci.yml +++ b/.kde-ci.yml @@ -4,32 +4,32 @@ Dependencies: - 'on': ['@all'] 'require': - 'frameworks/breeze-icons': '@stable' - 'frameworks/extra-cmake-modules': '@stable' - 'frameworks/kactivities': '@stable' - 'frameworks/kcmutils': '@stable' - 'frameworks/kconfig': '@stable' - 'frameworks/kconfigwidgets': '@stable' - 'frameworks/kcoreaddons': '@stable' - 'frameworks/kcrash': '@stable' - 'frameworks/kdeclarative': '@stable' - 'frameworks/kdoctools': '@stable' - 'frameworks/kglobalaccel': '@stable' - 'frameworks/ki18n': '@stable' - 'frameworks/kidletime': '@stable' - 'frameworks/kirigami': '@stable' - 'frameworks/knewstuff': '@stable' - 'frameworks/knotifications': '@stable' - 'frameworks/kpackage': '@stable' - 'frameworks/krunner': '@stable' - 'frameworks/kservice': '@stable' - 'frameworks/kwayland': '@stable' - 'frameworks/kwidgetsaddons': '@stable' - 'frameworks/kwindowsystem': '@stable' - 'frameworks/kxmlgui': '@stable' - 'frameworks/plasma-framework': '@stable' - 'libraries/libqaccessibilityclient': '@latest' - 'libraries/plasma-wayland-protocols': '@latest' + 'frameworks/breeze-icons': '@latest-kf6' + 'frameworks/extra-cmake-modules': '@latest-kf6' + 'frameworks/kactivities': '@latest-kf6' + 'frameworks/kcmutils': '@latest-kf6' + 'frameworks/kconfig': '@latest-kf6' + 'frameworks/kconfigwidgets': '@latest-kf6' + 'frameworks/kcoreaddons': '@latest-kf6' + 'frameworks/kcrash': '@latest-kf6' + 'frameworks/kdeclarative': '@latest-kf6' + 'frameworks/kdoctools': '@latest-kf6' + 'frameworks/kglobalaccel': '@latest-kf6' + 'frameworks/ki18n': '@latest-kf6' + 'frameworks/kidletime': '@latest-kf6' + 'frameworks/kirigami': '@latest-kf6' + 'frameworks/knewstuff': '@latest-kf6' + 'frameworks/knotifications': '@latest-kf6' + 'frameworks/kpackage': '@latest-kf6' + 'frameworks/krunner': '@latest-kf6' + 'frameworks/kservice': '@latest-kf6' + 'frameworks/kwayland': '@latest-kf6' + 'frameworks/kwidgetsaddons': '@latest-kf6' + 'frameworks/kwindowsystem': '@latest-kf6' + 'frameworks/kxmlgui': '@latest-kf6' + 'frameworks/plasma-framework': '@latest-kf6' + 'libraries/libqaccessibilityclient': '@latest-kf6' + 'libraries/plasma-wayland-protocols': '@latest-kf6' 'plasma/breeze': '@same' 'plasma/kdecoration': '@same' 'plasma/kscreenlocker': '@same' diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d1485acb1..84d564b297 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,11 +7,11 @@ set(CMAKE_C_STANDARD 99) set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(QT_MIN_VERSION "5.15.2") -set(KF5_MIN_VERSION "5.102.0") +set(QT_MIN_VERSION "6.4.0") +set(KF6_MIN_VERSION "5.240.0") set(KDE_COMPILERSETTINGS_LEVEL "5.82") -find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) +find_package(ECM ${KF6_MIN_VERSION} REQUIRED NO_MODULE) # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH}) @@ -47,8 +47,8 @@ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets ) if (QT_MAJOR_VERSION EQUAL "5") - find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS X11Extras) - find_package(Qt5XkbCommonSupport REQUIRED) + find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS X11Extras) + find_package(Qt6XkbCommonSupport REQUIRED) else() find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS WaylandClient ShaderTools) if (Qt6WaylandClient_VERSION VERSION_LESS "6.4.1") # TODO Plasma 6: Drop once minimum Qt version is 6.4.1+ @@ -67,7 +67,7 @@ if (NOT Qt${QT_MAJOR_VERSION}Test_FOUND) endif() # required frameworks by Core -find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS +find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS Auth Config ConfigWidgets @@ -83,7 +83,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS WindowSystem ) # required frameworks by config modules -find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS +find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS Declarative KCMUtils NewStuff @@ -98,36 +98,36 @@ set_package_properties(Threads PROPERTIES TYPE REQUIRED ) -find_package(KF5Wayland ${KF5_MIN_VERSION} CONFIG) -set_package_properties(KF5Wayland PROPERTIES +find_package(KF6Wayland ${KF6_MIN_VERSION} CONFIG) +set_package_properties(KF6Wayland PROPERTIES PURPOSE "Required to build wayland platform plugin and tests" TYPE REQUIRED ) # optional frameworks -find_package(KF5Activities ${KF5_MIN_VERSION} CONFIG) -set_package_properties(KF5Activities PROPERTIES +find_package(KF6Activities ${KF6_MIN_VERSION} CONFIG) +set_package_properties(KF6Activities PROPERTIES PURPOSE "Enable building of KWin with kactivities support" TYPE OPTIONAL ) -add_feature_info("KF5Activities" KF5Activities_FOUND "Enable building of KWin with kactivities support") +add_feature_info("KF6Activities" KF6Activities_FOUND "Enable building of KWin with kactivities support") -find_package(KF5DocTools ${KF5_MIN_VERSION} CONFIG) -set_package_properties(KF5DocTools PROPERTIES +find_package(KF6DocTools ${KF6_MIN_VERSION} CONFIG) +set_package_properties(KF6DocTools PROPERTIES PURPOSE "Enable building documentation" TYPE OPTIONAL ) -add_feature_info("KF5DocTools" KF5DocTools_FOUND "Enable building documentation") +add_feature_info("KF6DocTools" KF6DocTools_FOUND "Enable building documentation") -find_package(KF5Runner ${KF5_MIN_VERSION} CONFIG) -set_package_properties(KF5Runner PROPERTIES +find_package(KF6Runner ${KF6_MIN_VERSION} CONFIG) +set_package_properties(KF6Runner PROPERTIES PURPOSE "Enable building of KWin with krunner support" TYPE OPTIONAL ) -add_feature_info("KF5Runner" KF5Runner_FOUND "Enable building of KWin with krunner support") +add_feature_info("KF6Runner" KF6Runner_FOUND "Enable building of KWin with krunner support") -find_package(KF5Kirigami2 ${KF5_MIN_VERSION} CONFIG) -set_package_properties(KF5Kirigami2 PROPERTIES +find_package(KF6Kirigami2 ${KF6_MIN_VERSION} CONFIG) +set_package_properties(KF6Kirigami2 PROPERTIES DESCRIPTION "A QtQuick based components set" PURPOSE "Required at runtime for Virtual desktop KCM" TYPE RUNTIME @@ -315,10 +315,10 @@ set_package_properties(X11_XCB PROPERTIES # dependencies for QPA plugin if (QT_MAJOR_VERSION EQUAL "5") - find_package(Qt5FontDatabaseSupport REQUIRED) - find_package(Qt5ThemeSupport REQUIRED) - find_package(Qt5ServiceSupport REQUIRED) - find_package(Qt5EventDispatcherSupport REQUIRED) + find_package(Qt6FontDatabaseSupport REQUIRED) + find_package(Qt6ThemeSupport REQUIRED) + find_package(Qt6ServiceSupport REQUIRED) + find_package(Qt6EventDispatcherSupport REQUIRED) endif() find_package(Freetype) @@ -381,8 +381,8 @@ option(KWIN_BUILD_KCMS "Enable building of KWin configuration modules." ON) option(KWIN_BUILD_NOTIFICATIONS "Enable building of KWin with knotifications support" ON) option(KWIN_BUILD_SCREENLOCKER "Enable building of KWin lockscreen functionality" ON) option(KWIN_BUILD_TABBOX "Enable building of KWin Tabbox functionality" ON) -cmake_dependent_option(KWIN_BUILD_ACTIVITIES "Enable building of KWin with kactivities support" ON "KF5Activities_FOUND" OFF) -cmake_dependent_option(KWIN_BUILD_RUNNERS "Enable building of KWin with krunner support" ON "KF5Runner_FOUND" OFF) +cmake_dependent_option(KWIN_BUILD_ACTIVITIES "Enable building of KWin with kactivities support" ON "KF6Activities_FOUND" OFF) +cmake_dependent_option(KWIN_BUILD_RUNNERS "Enable building of KWin with krunner support" ON "KF6Runner_FOUND" OFF) set(HAVE_EPOXY_GLX ${epoxy_HAS_GLX}) @@ -399,7 +399,7 @@ pkg_check_modules(PipeWire IMPORTED_TARGET libpipewire-0.3>=0.3.29) add_feature_info(PipeWire PipeWire_FOUND "Required for Wayland screencasting") if (KWIN_BUILD_NOTIFICATIONS) - find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Notifications) + find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS Notifications) endif() if (KWIN_BUILD_SCREENLOCKER) @@ -442,7 +442,7 @@ add_definitions( -DEGL_NO_PLATFORM_SPECIFIC_TYPES ) -if (KF5DocTools_FOUND) +if (KF6DocTools_FOUND) add_subdirectory(doc) kdoctools_install(po) endif() diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt index aaf10635d3..aaadf7210a 100644 --- a/autotests/CMakeLists.txt +++ b/autotests/CMakeLists.txt @@ -30,10 +30,10 @@ target_link_libraries(testVirtualDesktops Qt::Test Qt::Widgets - KF5::ConfigCore - KF5::GlobalAccel - KF5::I18n - KF5::WindowSystem + KF6::ConfigCore + KF6::GlobalAccel + KF6::I18n + KF6::WindowSystem ) add_test(NAME kwin-testVirtualDesktops COMMAND testVirtualDesktops) ecm_mark_as_test(testVirtualDesktops) @@ -54,8 +54,8 @@ target_link_libraries(testClientMachine Qt::Test Qt::Widgets - KF5::ConfigCore - KF5::WindowSystem + KF6::ConfigCore + KF6::WindowSystem XCB::XCB XCB::XFIXES @@ -79,8 +79,8 @@ target_link_libraries(testXcbWrapper Qt::Test Qt::Widgets - KF5::ConfigCore - KF5::WindowSystem + KF6::ConfigCore + KF6::WindowSystem XCB::XCB ) @@ -99,8 +99,8 @@ if (XCB_ICCCM_FOUND) Qt::Test Qt::Widgets - KF5::ConfigCore - KF5::WindowSystem + KF6::ConfigCore + KF6::WindowSystem XCB::ICCCM XCB::XCB @@ -123,8 +123,8 @@ target_link_libraries(testXcbWindow Qt::Test Qt::Widgets - KF5::ConfigCore - KF5::WindowSystem + KF6::ConfigCore + KF6::WindowSystem XCB::XCB ) @@ -154,7 +154,7 @@ target_link_libraries(testOnScreenNotification Qt::Test Qt::Widgets # QAction include - KF5::ConfigCore + KF6::ConfigCore ) add_test(NAME kwin-testOnScreenNotification COMMAND testOnScreenNotification) @@ -182,7 +182,7 @@ ecm_mark_as_test(testGestures) ######################################################## add_executable(testX11TimestampUpdate test_x11_timestamp_update.cpp) target_link_libraries(testX11TimestampUpdate - KF5::CoreAddons + KF6::CoreAddons Qt::Test kwin ) @@ -216,15 +216,15 @@ target_link_libraries(testXkb Qt::Test Qt::Widgets - KF5::ConfigCore - KF5::WindowSystem + KF6::ConfigCore + KF6::WindowSystem kwineffects XKB::XKB ) if (QT_MAJOR_VERSION EQUAL "5") - target_link_libraries(testXkb Qt5::XkbCommonSupportPrivate) + target_link_libraries(testXkb Qt6::XkbCommonSupportPrivate) else() target_link_libraries(testXkb Qt::GuiPrivate) endif() diff --git a/autotests/drm/CMakeLists.txt b/autotests/drm/CMakeLists.txt index 8a3aefedf2..89f0254619 100644 --- a/autotests/drm/CMakeLists.txt +++ b/autotests/drm/CMakeLists.txt @@ -36,10 +36,10 @@ add_library(LibDrmTest STATIC ${mockDRM_SRCS}) target_link_libraries(LibDrmTest Qt::Gui Qt::Widgets - KF5::ConfigCore - KF5::WindowSystem - KF5::CoreAddons - KF5::I18n + KF6::ConfigCore + KF6::WindowSystem + KF6::CoreAddons + KF6::I18n XCB::XCB PkgConfig::Libxcvt gbm::gbm diff --git a/autotests/integration/CMakeLists.txt b/autotests/integration/CMakeLists.txt index 96d0baa652..9f09686646 100644 --- a/autotests/integration/CMakeLists.txt +++ b/autotests/integration/CMakeLists.txt @@ -67,7 +67,7 @@ target_sources(KWinIntegrationTestFramework PRIVATE target_link_libraries(KWinIntegrationTestFramework PUBLIC Qt::Test - KF5::WaylandClient + KF6::WaylandClient Wayland::Client kwin @@ -77,9 +77,9 @@ target_link_libraries(KWinIntegrationTestFramework # Static plugins KWinQpaPlugin - KF5GlobalAccelKWinPlugin - KF5WindowSystemKWinPlugin - KF5IdleTimeKWinPlugin + KF6GlobalAccelKWinPlugin + KF6WindowSystemKWinPlugin + KF6IdleTimeKWinPlugin ) kcoreaddons_target_static_plugins(KWinIntegrationTestFramework "kwin/effects/plugins" LINK_OPTION "PRIVATE") set_target_properties(KWinIntegrationTestFramework PROPERTIES CXX_VISIBILITY_PRESET default) diff --git a/autotests/integration/fakes/org.kde.kdecoration2/CMakeLists.txt b/autotests/integration/fakes/org.kde.kdecoration2/CMakeLists.txt index 1b233ed51d..208b3ac0b1 100644 --- a/autotests/integration/fakes/org.kde.kdecoration2/CMakeLists.txt +++ b/autotests/integration/fakes/org.kde.kdecoration2/CMakeLists.txt @@ -11,5 +11,5 @@ target_link_libraries(fakedecoshadows Qt::Gui PRIVATE KDecoration2::KDecoration - KF5::CoreAddons) + KF6::CoreAddons) diff --git a/autotests/libinput/CMakeLists.txt b/autotests/libinput/CMakeLists.txt index 8fed98fa88..ce860e1949 100644 --- a/autotests/libinput/CMakeLists.txt +++ b/autotests/libinput/CMakeLists.txt @@ -2,14 +2,14 @@ include_directories(${Libinput_INCLUDE_DIRS}) add_definitions(-DKWIN_BUILD_TESTING) add_library(LibInputTestObjects STATIC ../../src/backends/libinput/device.cpp ../../src/backends/libinput/events.cpp ../../src/core/inputdevice.cpp ../../src/mousebuttons.cpp mock_libinput.cpp) -target_link_libraries(LibInputTestObjects Qt::Test Qt::Widgets Qt::DBus Qt::Gui KF5::ConfigCore) +target_link_libraries(LibInputTestObjects Qt::Test Qt::Widgets Qt::DBus Qt::Gui KF6::ConfigCore) target_include_directories(LibInputTestObjects PUBLIC ${CMAKE_SOURCE_DIR}/src) ######################################################## # Test Devices ######################################################## add_executable(testLibinputDevice device_test.cpp) -target_link_libraries(testLibinputDevice Qt::Test Qt::DBus Qt::Gui KF5::ConfigCore LibInputTestObjects) +target_link_libraries(testLibinputDevice Qt::Test Qt::DBus Qt::Gui KF6::ConfigCore LibInputTestObjects) add_test(NAME kwin-testLibinputDevice COMMAND testLibinputDevice) ecm_mark_as_test(testLibinputDevice) @@ -17,7 +17,7 @@ ecm_mark_as_test(testLibinputDevice) # Test Key Event ######################################################## add_executable(testLibinputKeyEvent key_event_test.cpp) -target_link_libraries(testLibinputKeyEvent Qt::Test Qt::DBus Qt::Widgets KF5::ConfigCore LibInputTestObjects) +target_link_libraries(testLibinputKeyEvent Qt::Test Qt::DBus Qt::Widgets KF6::ConfigCore LibInputTestObjects) add_test(NAME kwin-testLibinputKeyEvent COMMAND testLibinputKeyEvent) ecm_mark_as_test(testLibinputKeyEvent) @@ -25,7 +25,7 @@ ecm_mark_as_test(testLibinputKeyEvent) # Test Pointer Event ######################################################## add_executable(testLibinputPointerEvent pointer_event_test.cpp) -target_link_libraries(testLibinputPointerEvent Qt::Test Qt::DBus Qt::Widgets KF5::ConfigCore LibInputTestObjects) +target_link_libraries(testLibinputPointerEvent Qt::Test Qt::DBus Qt::Widgets KF6::ConfigCore LibInputTestObjects) add_test(NAME kwin-testLibinputPointerEvent COMMAND testLibinputPointerEvent) ecm_mark_as_test(testLibinputPointerEvent) @@ -33,7 +33,7 @@ ecm_mark_as_test(testLibinputPointerEvent) # Test Touch Event ######################################################## add_executable(testLibinputTouchEvent touch_event_test.cpp) -target_link_libraries(testLibinputTouchEvent Qt::Test Qt::DBus Qt::Widgets KF5::ConfigCore LibInputTestObjects) +target_link_libraries(testLibinputTouchEvent Qt::Test Qt::DBus Qt::Widgets KF6::ConfigCore LibInputTestObjects) add_test(NAME kwin-testLibinputTouchEvent COMMAND testLibinputTouchEvent) ecm_mark_as_test(testLibinputTouchEvent) @@ -41,7 +41,7 @@ ecm_mark_as_test(testLibinputTouchEvent) # Test Gesture Event ######################################################## add_executable(testLibinputGestureEvent gesture_event_test.cpp) -target_link_libraries(testLibinputGestureEvent Qt::Test Qt::DBus Qt::Widgets KF5::ConfigCore LibInputTestObjects) +target_link_libraries(testLibinputGestureEvent Qt::Test Qt::DBus Qt::Widgets KF6::ConfigCore LibInputTestObjects) add_test(NAME kwin-testLibinputGestureEvent COMMAND testLibinputGestureEvent) ecm_mark_as_test(testLibinputGestureEvent) @@ -49,7 +49,7 @@ ecm_mark_as_test(testLibinputGestureEvent) # Test Switch Event ######################################################## add_executable(testLibinputSwitchEvent switch_event_test.cpp) -target_link_libraries(testLibinputSwitchEvent Qt::Test Qt::DBus Qt::Widgets KF5::ConfigCore LibInputTestObjects) +target_link_libraries(testLibinputSwitchEvent Qt::Test Qt::DBus Qt::Widgets KF6::ConfigCore LibInputTestObjects) add_test(NAME kwin-testLibinputSwitchEvent COMMAND testLibinputSwitchEvent) ecm_mark_as_test(testLibinputSwitchEvent) @@ -57,6 +57,6 @@ ecm_mark_as_test(testLibinputSwitchEvent) # Test Input Events ######################################################## add_executable(testInputEvents input_event_test.cpp ../../src/input_event.cpp) -target_link_libraries(testInputEvents Qt::Test Qt::DBus Qt::Gui Qt::Widgets KF5::ConfigCore LibInputTestObjects) +target_link_libraries(testInputEvents Qt::Test Qt::DBus Qt::Gui Qt::Widgets KF6::ConfigCore LibInputTestObjects) add_test(NAME kwin-testInputEvents COMMAND testInputEvents) ecm_mark_as_test(testInputEvents) diff --git a/autotests/libkwineffects/CMakeLists.txt b/autotests/libkwineffects/CMakeLists.txt index 090d18f9bb..0bd07c699d 100644 --- a/autotests/libkwineffects/CMakeLists.txt +++ b/autotests/libkwineffects/CMakeLists.txt @@ -16,7 +16,7 @@ kwineffects_unit_tests( add_executable(kwinglplatformtest kwinglplatformtest.cpp mock_gl.cpp ../../src/libkwineffects/kwinglplatform.cpp) add_test(NAME kwineffects-kwinglplatformtest COMMAND kwinglplatformtest) -target_link_libraries(kwinglplatformtest Qt::Test Qt::Gui KF5::ConfigCore XCB::XCB) +target_link_libraries(kwinglplatformtest Qt::Test Qt::Gui KF6::ConfigCore XCB::XCB) if (QT_MAJOR_VERSION EQUAL "5") target_link_libraries(kwinglplatformtest Qt::X11Extras) endif() diff --git a/autotests/tabbox/CMakeLists.txt b/autotests/tabbox/CMakeLists.txt index 0d7f7b97f5..592e09cde3 100644 --- a/autotests/tabbox/CMakeLists.txt +++ b/autotests/tabbox/CMakeLists.txt @@ -24,10 +24,10 @@ target_link_libraries(testTabBoxClientModel Qt::Widgets Qt::GuiPrivate - KF5::ConfigCore - KF5::I18n - KF5::Package - KF5::WindowSystem + KF6::ConfigCore + KF6::I18n + KF6::Package + KF6::WindowSystem XCB::XCB ) @@ -61,10 +61,10 @@ target_link_libraries(testTabBoxHandler Qt::Widgets Qt::GuiPrivate - KF5::ConfigCore - KF5::I18n - KF5::Package - KF5::WindowSystem + KF6::ConfigCore + KF6::I18n + KF6::Package + KF6::WindowSystem XCB::XCB ) diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 690a113ca1..322459beff 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -3,7 +3,7 @@ add_subdirectory(icons) ########### next target ############### add_executable(kwin5_update_default_rules update_default_rules.cpp) target_link_libraries(kwin5_update_default_rules - KF5::ConfigCore + KF6::ConfigCore Qt::Core Qt::DBus ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 07409a7592..09cb97aec4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -189,16 +189,16 @@ target_link_libraries(kwin Qt::DBus Qt::Quick - KF5::ConfigCore - KF5::ConfigWidgets - KF5::CoreAddons - KF5::Crash - KF5::GlobalAccel - KF5::GlobalAccelPrivate - KF5::I18n - KF5::Package - KF5::Service - KF5::WindowSystem + KF6::ConfigCore + KF6::ConfigWidgets + KF6::CoreAddons + KF6::Crash + KF6::GlobalAccel + KF6::GlobalAccelPrivate + KF6::I18n + KF6::Package + KF6::Service + KF6::WindowSystem KDecoration2::KDecoration KDecoration2::KDecoration2Private @@ -228,11 +228,11 @@ target_link_libraries(kwin lcms2::lcms2 ) if (QT_MAJOR_VERSION EQUAL "5") - target_link_libraries(kwin Qt5::X11Extras Qt5::XkbCommonSupportPrivate) + target_link_libraries(kwin Qt6::X11Extras Qt6::XkbCommonSupportPrivate) endif() if (KWIN_BUILD_NOTIFICATIONS) - target_link_libraries(kwin KF5::Notifications) + target_link_libraries(kwin KF6::Notifications) endif() kconfig_add_kcfg_files(kwin @@ -257,7 +257,7 @@ qt_add_dbus_adaptor(kwin_dbus_SRCS org.kde.KWin.Plugins.xml dbusinterface.h KWin qt_add_dbus_interface(kwin_dbus_SRCS org.freedesktop.DBus.Properties.xml dbusproperties_interface) if (KWIN_BUILD_SCREENLOCKER) - qt_add_dbus_interface(kwin_dbus_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface) + qt_add_dbus_interface(kwin_dbus_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf6_org.freedesktop.ScreenSaver.xml screenlocker_interface) qt_add_dbus_interface(kwin_dbus_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface) endif() @@ -274,7 +274,7 @@ add_subdirectory(xwayland) if (KWIN_BUILD_ACTIVITIES) target_sources(kwin PRIVATE activities.cpp) - target_link_libraries(kwin KF5::Activities) + target_link_libraries(kwin KF6::Activities) endif() if (KWIN_BUILD_SCREENLOCKER) @@ -336,9 +336,9 @@ add_subdirectory(plugins) target_link_libraries(kwin_wayland KWinQpaPlugin - KF5GlobalAccelKWinPlugin - KF5WindowSystemKWinPlugin - KF5IdleTimeKWinPlugin + KF6GlobalAccelKWinPlugin + KF6WindowSystemKWinPlugin + KF6IdleTimeKWinPlugin ) add_custom_target( diff --git a/src/backends/wayland/CMakeLists.txt b/src/backends/wayland/CMakeLists.txt index 2c64d05d0f..b83090c755 100644 --- a/src/backends/wayland/CMakeLists.txt +++ b/src/backends/wayland/CMakeLists.txt @@ -7,4 +7,4 @@ target_sources(kwin PRIVATE wayland_qpainter_backend.cpp ) -target_link_libraries(kwin KF5::WaylandClient Wayland::Client gbm::gbm) +target_link_libraries(kwin KF6::WaylandClient Wayland::Client gbm::gbm) diff --git a/src/backends/x11/standalone/CMakeLists.txt b/src/backends/x11/standalone/CMakeLists.txt index 147f7f8eea..294402ff28 100644 --- a/src/backends/x11/standalone/CMakeLists.txt +++ b/src/backends/x11/standalone/CMakeLists.txt @@ -18,7 +18,7 @@ set(X11PLATFORM_SOURCES ) add_library(KWinX11Platform OBJECT ${X11PLATFORM_SOURCES}) -target_link_libraries(KWinX11Platform kwin KF5::Crash X11::X11 XCB::XKB PkgConfig::XKBX11) +target_link_libraries(KWinX11Platform kwin KF6::Crash X11::X11 XCB::XKB PkgConfig::XKBX11) if (QT_MAJOR_VERSION EQUAL "5") target_link_libraries(KWinX11Platform Qt::X11Extras) endif() diff --git a/src/effects/blur/CMakeLists.txt b/src/effects/blur/CMakeLists.txt index a69b15355b..ccd3797c3e 100644 --- a/src/effects/blur/CMakeLists.txt +++ b/src/effects/blur/CMakeLists.txt @@ -18,7 +18,7 @@ target_link_libraries(kwin4_effect_blur PRIVATE kwineffects kwinglutils - KF5::ConfigGui + KF6::ConfigGui KDecoration2::KDecoration ) @@ -33,9 +33,9 @@ if (KWIN_BUILD_KCMS) kwin_add_effect_config(kwin_blur_config ${kwin_blur_config_SRCS}) target_link_libraries(kwin_blur_config - KF5::ConfigWidgets - KF5::CoreAddons - KF5::I18n + KF6::ConfigWidgets + KF6::CoreAddons + KF6::I18n Qt::DBus KWinEffectsInterface ) diff --git a/src/effects/colorpicker/CMakeLists.txt b/src/effects/colorpicker/CMakeLists.txt index d6e094cb53..ffd4bbe513 100644 --- a/src/effects/colorpicker/CMakeLists.txt +++ b/src/effects/colorpicker/CMakeLists.txt @@ -10,7 +10,7 @@ kwin4_add_effect_module(kwin4_effect_colorpicker ${colorpicker_SOURCES}) target_link_libraries(kwin4_effect_colorpicker PRIVATE kwineffects - KF5::I18n + KF6::I18n Qt::DBus ) diff --git a/src/effects/desktopgrid/CMakeLists.txt b/src/effects/desktopgrid/CMakeLists.txt index 87b5bea871..4aed2dde53 100644 --- a/src/effects/desktopgrid/CMakeLists.txt +++ b/src/effects/desktopgrid/CMakeLists.txt @@ -17,9 +17,9 @@ kwin4_add_effect_module(kwin4_effect_desktopgrid ${desktopgrid_SOURCES}) target_link_libraries(kwin4_effect_desktopgrid PRIVATE kwineffects - KF5::ConfigGui - KF5::GlobalAccel - KF5::I18n + KF6::ConfigGui + KF6::GlobalAccel + KF6::I18n Qt::Quick ) @@ -34,11 +34,11 @@ if (KWIN_BUILD_KCMS) kwin_add_effect_config(kwin_desktopgrid_config ${kwin_desktopgrid_config_SRCS}) target_link_libraries(kwin_desktopgrid_config - KF5::ConfigWidgets - KF5::CoreAddons - KF5::GlobalAccel - KF5::I18n - KF5::XmlGui + KF6::ConfigWidgets + KF6::CoreAddons + KF6::GlobalAccel + KF6::I18n + KF6::XmlGui Qt::Quick kwineffects KWinEffectsInterface diff --git a/src/effects/diminactive/CMakeLists.txt b/src/effects/diminactive/CMakeLists.txt index 8cc1ca7653..bc6695bf04 100644 --- a/src/effects/diminactive/CMakeLists.txt +++ b/src/effects/diminactive/CMakeLists.txt @@ -14,7 +14,7 @@ kwin4_add_effect_module(kwin4_effect_diminactive ${diminactive_SOURCES}) target_link_libraries(kwin4_effect_diminactive PRIVATE kwineffects - KF5::ConfigGui + KF6::ConfigGui ) ####################################### @@ -27,9 +27,9 @@ if (KWIN_BUILD_KCMS) kwin_add_effect_config(kwin_diminactive_config ${kwin_diminactive_config_SRCS}) target_link_libraries(kwin_diminactive_config - KF5::ConfigWidgets - KF5::CoreAddons - KF5::I18n + KF6::ConfigWidgets + KF6::CoreAddons + KF6::I18n Qt::DBus KWinEffectsInterface ) diff --git a/src/effects/fallapart/CMakeLists.txt b/src/effects/fallapart/CMakeLists.txt index 1f5737b5e1..3077e144d8 100644 --- a/src/effects/fallapart/CMakeLists.txt +++ b/src/effects/fallapart/CMakeLists.txt @@ -15,5 +15,5 @@ kwin4_add_effect_module(kwin4_effect_fallapart ${fallapart_SOURCES}) target_link_libraries(kwin4_effect_fallapart PRIVATE kwineffects - KF5::ConfigGui + KF6::ConfigGui ) diff --git a/src/effects/glide/CMakeLists.txt b/src/effects/glide/CMakeLists.txt index b0bcba8911..bd8e7b226c 100644 --- a/src/effects/glide/CMakeLists.txt +++ b/src/effects/glide/CMakeLists.txt @@ -14,7 +14,7 @@ kwin4_add_effect_module(kwin4_effect_glide ${glide_SOURCES}) target_link_libraries(kwin4_effect_glide PRIVATE kwineffects - KF5::ConfigGui + KF6::ConfigGui ) ####################################### @@ -27,9 +27,9 @@ if (KWIN_BUILD_KCMS) kwin_add_effect_config(kwin_glide_config ${kwin_glide_config_SRCS}) target_link_libraries(kwin_glide_config - KF5::ConfigWidgets - KF5::CoreAddons - KF5::I18n + KF6::ConfigWidgets + KF6::CoreAddons + KF6::I18n Qt::DBus KWinEffectsInterface ) diff --git a/src/effects/invert/CMakeLists.txt b/src/effects/invert/CMakeLists.txt index 1e360a2bf0..9bc66f7d5b 100644 --- a/src/effects/invert/CMakeLists.txt +++ b/src/effects/invert/CMakeLists.txt @@ -12,8 +12,8 @@ target_link_libraries(kwin4_effect_invert PRIVATE kwineffects kwinglutils - KF5::GlobalAccel - KF5::I18n + KF6::GlobalAccel + KF6::I18n ) ####################################### @@ -24,11 +24,11 @@ if (KWIN_BUILD_KCMS) kwin_add_effect_config(kwin_invert_config ${kwin_invert_config_SRCS}) target_link_libraries(kwin_invert_config - KF5::ConfigWidgets - KF5::CoreAddons - KF5::GlobalAccel - KF5::I18n - KF5::XmlGui + KF6::ConfigWidgets + KF6::CoreAddons + KF6::GlobalAccel + KF6::I18n + KF6::XmlGui KWinEffectsInterface ) endif() diff --git a/src/effects/kscreen/CMakeLists.txt b/src/effects/kscreen/CMakeLists.txt index 7f3202dd02..a66782dad8 100644 --- a/src/effects/kscreen/CMakeLists.txt +++ b/src/effects/kscreen/CMakeLists.txt @@ -12,5 +12,5 @@ kwin4_add_effect_module(kwin4_effect_kscreen ${kscreen_SOURCES}) target_link_libraries(kwin4_effect_kscreen PRIVATE kwineffects - KF5::ConfigGui + KF6::ConfigGui ) diff --git a/src/effects/magiclamp/CMakeLists.txt b/src/effects/magiclamp/CMakeLists.txt index a4e6cc6496..a9aaa7fea4 100644 --- a/src/effects/magiclamp/CMakeLists.txt +++ b/src/effects/magiclamp/CMakeLists.txt @@ -14,7 +14,7 @@ kwin4_add_effect_module(kwin4_effect_magiclamp ${magiclamp_SOURCES}) target_link_libraries(kwin4_effect_magiclamp PRIVATE kwineffects - KF5::ConfigGui + KF6::ConfigGui ) ####################################### @@ -27,9 +27,9 @@ if (KWIN_BUILD_KCMS) kwin_add_effect_config(kwin_magiclamp_config ${kwin_magiclamp_config_SRCS}) target_link_libraries(kwin_magiclamp_config - KF5::ConfigWidgets - KF5::CoreAddons - KF5::I18n + KF6::ConfigWidgets + KF6::CoreAddons + KF6::I18n Qt::DBus KWinEffectsInterface ) diff --git a/src/effects/magnifier/CMakeLists.txt b/src/effects/magnifier/CMakeLists.txt index 2d456141d3..0b341c8b15 100644 --- a/src/effects/magnifier/CMakeLists.txt +++ b/src/effects/magnifier/CMakeLists.txt @@ -15,10 +15,10 @@ target_link_libraries(kwin4_effect_magnifier PRIVATE kwineffects kwinglutils - KF5::ConfigGui - KF5::ConfigWidgets - KF5::GlobalAccel - KF5::I18n + KF6::ConfigGui + KF6::ConfigWidgets + KF6::GlobalAccel + KF6::I18n ) ####################################### @@ -31,11 +31,11 @@ if (KWIN_BUILD_KCMS) kwin_add_effect_config(kwin_magnifier_config ${kwin_magnifier_config_SRCS}) target_link_libraries(kwin_magnifier_config - KF5::ConfigWidgets - KF5::CoreAddons - KF5::GlobalAccel - KF5::I18n - KF5::XmlGui + KF6::ConfigWidgets + KF6::CoreAddons + KF6::GlobalAccel + KF6::I18n + KF6::XmlGui KWinEffectsInterface ) endif() diff --git a/src/effects/mouseclick/CMakeLists.txt b/src/effects/mouseclick/CMakeLists.txt index ad0874d0fe..fbf40955c6 100644 --- a/src/effects/mouseclick/CMakeLists.txt +++ b/src/effects/mouseclick/CMakeLists.txt @@ -15,9 +15,9 @@ target_link_libraries(kwin4_effect_mouseclick PRIVATE kwineffects kwinglutils - KF5::ConfigGui - KF5::GlobalAccel - KF5::I18n + KF6::ConfigGui + KF6::GlobalAccel + KF6::I18n ) ########################## @@ -31,11 +31,11 @@ if (KWIN_BUILD_KCMS) kwin_add_effect_config(kwin_mouseclick_config ${kwin_mouseclick_config_SRCS}) target_link_libraries(kwin_mouseclick_config - KF5::ConfigWidgets - KF5::CoreAddons - KF5::GlobalAccel - KF5::I18n - KF5::XmlGui + KF6::ConfigWidgets + KF6::CoreAddons + KF6::GlobalAccel + KF6::I18n + KF6::XmlGui KWinEffectsInterface ) endif() diff --git a/src/effects/mousemark/CMakeLists.txt b/src/effects/mousemark/CMakeLists.txt index de00c86b09..1faf8ebf00 100644 --- a/src/effects/mousemark/CMakeLists.txt +++ b/src/effects/mousemark/CMakeLists.txt @@ -15,9 +15,9 @@ target_link_libraries(kwin4_effect_mousemark PRIVATE kwineffects kwinglutils - KF5::ConfigGui - KF5::GlobalAccel - KF5::I18n + KF6::ConfigGui + KF6::GlobalAccel + KF6::I18n ) ####################################### @@ -30,11 +30,11 @@ if (KWIN_BUILD_KCMS) kwin_add_effect_config(kwin_mousemark_config ${kwin_mousemark_config_SRCS}) target_link_libraries(kwin_mousemark_config - KF5::ConfigWidgets - KF5::CoreAddons - KF5::GlobalAccel - KF5::I18n - KF5::XmlGui + KF6::ConfigWidgets + KF6::CoreAddons + KF6::GlobalAccel + KF6::I18n + KF6::XmlGui KWinEffectsInterface ) endif() diff --git a/src/effects/outputlocator/CMakeLists.txt b/src/effects/outputlocator/CMakeLists.txt index ef0a42c388..3f09bde2bb 100644 --- a/src/effects/outputlocator/CMakeLists.txt +++ b/src/effects/outputlocator/CMakeLists.txt @@ -8,7 +8,7 @@ target_link_libraries(kwin4_effect_outputlocator PRIVATE kwineffects Qt::DBus Qt::Quick - KF5::I18n + KF6::I18n ) install(DIRECTORY qml DESTINATION ${KDE_INSTALL_DATADIR}/kwin/effects/outputlocator) diff --git a/src/effects/overview/CMakeLists.txt b/src/effects/overview/CMakeLists.txt index 749b90eddd..fc808895d4 100644 --- a/src/effects/overview/CMakeLists.txt +++ b/src/effects/overview/CMakeLists.txt @@ -19,9 +19,9 @@ kwin4_add_effect_module(kwin4_effect_overview ${overview_SOURCES}) target_link_libraries(kwin4_effect_overview PRIVATE kwineffects - KF5::ConfigGui - KF5::GlobalAccel - KF5::I18n + KF6::ConfigGui + KF6::GlobalAccel + KF6::I18n Qt::Quick ) diff --git a/src/effects/overview/kcm/CMakeLists.txt b/src/effects/overview/kcm/CMakeLists.txt index a2eb99a3cd..2911467c3f 100644 --- a/src/effects/overview/kcm/CMakeLists.txt +++ b/src/effects/overview/kcm/CMakeLists.txt @@ -8,10 +8,10 @@ kconfig_add_kcfg_files(kwin_overview_config_SOURCES ../overviewconfig.kcfgc) kwin_add_effect_config(kwin_overview_config ${kwin_overview_config_SOURCES}) target_link_libraries(kwin_overview_config - KF5::ConfigWidgets - KF5::CoreAddons - KF5::GlobalAccel - KF5::I18n - KF5::XmlGui + KF6::ConfigWidgets + KF6::CoreAddons + KF6::GlobalAccel + KF6::I18n + KF6::XmlGui KWinEffectsInterface ) diff --git a/src/effects/screenedge/CMakeLists.txt b/src/effects/screenedge/CMakeLists.txt index fd04f79013..efce6b23b0 100644 --- a/src/effects/screenedge/CMakeLists.txt +++ b/src/effects/screenedge/CMakeLists.txt @@ -12,5 +12,5 @@ target_link_libraries(kwin4_effect_screenedge PRIVATE kwineffects kwinglutils - KF5::Plasma + KF6::Plasma ) diff --git a/src/effects/screenshot/CMakeLists.txt b/src/effects/screenshot/CMakeLists.txt index 5fa3a65004..8ec7644ae5 100644 --- a/src/effects/screenshot/CMakeLists.txt +++ b/src/effects/screenshot/CMakeLists.txt @@ -16,15 +16,15 @@ target_link_libraries(kwin4_effect_screenshot PRIVATE kwineffects kwinglutils - KF5::Service - KF5::I18n + KF6::Service + KF6::I18n Qt::Concurrent Qt::DBus ) if (KWIN_BUILD_NOTIFICATIONS) - target_link_libraries(kwin4_effect_screenshot PRIVATE KF5::Notifications) + target_link_libraries(kwin4_effect_screenshot PRIVATE KF6::Notifications) endif() ecm_qt_declare_logging_category(kwin4_effect_screenshot diff --git a/src/effects/sheet/CMakeLists.txt b/src/effects/sheet/CMakeLists.txt index 106e0f956a..27eb03f657 100644 --- a/src/effects/sheet/CMakeLists.txt +++ b/src/effects/sheet/CMakeLists.txt @@ -12,5 +12,5 @@ kwin4_add_effect_module(kwin4_effect_sheet ${sheet_SOURCES}) target_link_libraries(kwin4_effect_sheet PRIVATE kwineffects - KF5::ConfigGui + KF6::ConfigGui ) diff --git a/src/effects/showfps/CMakeLists.txt b/src/effects/showfps/CMakeLists.txt index 6557029b23..ee3842b321 100644 --- a/src/effects/showfps/CMakeLists.txt +++ b/src/effects/showfps/CMakeLists.txt @@ -12,7 +12,7 @@ kwin4_add_effect_module(kwin4_effect_showfps ${showfps_SOURCES}) target_link_libraries(kwin4_effect_showfps PRIVATE kwineffects - KF5::I18n + KF6::I18n Qt::Quick ) diff --git a/src/effects/showpaint/CMakeLists.txt b/src/effects/showpaint/CMakeLists.txt index acd8fadadb..32528ca0bb 100644 --- a/src/effects/showpaint/CMakeLists.txt +++ b/src/effects/showpaint/CMakeLists.txt @@ -11,8 +11,8 @@ target_link_libraries(kwin4_effect_showpaint PRIVATE kwineffects kwinglutils - KF5::GlobalAccel - KF5::I18n + KF6::GlobalAccel + KF6::I18n ) ####################################### @@ -24,10 +24,10 @@ if (KWIN_BUILD_KCMS) kwin_add_effect_config(kwin_showpaint_config ${kwin_showpaint_config_SRCS}) target_link_libraries(kwin_showpaint_config - KF5::ConfigWidgets - KF5::CoreAddons - KF5::GlobalAccel - KF5::I18n - KF5::XmlGui + KF6::ConfigWidgets + KF6::CoreAddons + KF6::GlobalAccel + KF6::I18n + KF6::XmlGui ) endif() diff --git a/src/effects/slide/CMakeLists.txt b/src/effects/slide/CMakeLists.txt index 57e77b657e..6d7b35ff25 100644 --- a/src/effects/slide/CMakeLists.txt +++ b/src/effects/slide/CMakeLists.txt @@ -15,7 +15,7 @@ kwin4_add_effect_module(kwin4_effect_slide ${slide_SOURCES}) target_link_libraries(kwin4_effect_slide PRIVATE kwineffects - KF5::ConfigGui + KF6::ConfigGui ) ####################################### @@ -28,9 +28,9 @@ if (KWIN_BUILD_KCMS) kwin_add_effect_config(kwin_slide_config ${kwin_slide_config_SRCS}) target_link_libraries(kwin_slide_config - KF5::ConfigWidgets - KF5::CoreAddons - KF5::I18n + KF6::ConfigWidgets + KF6::CoreAddons + KF6::I18n Qt::DBus KWinEffectsInterface ) diff --git a/src/effects/slidingpopups/CMakeLists.txt b/src/effects/slidingpopups/CMakeLists.txt index 566d546343..82e3d70fad 100644 --- a/src/effects/slidingpopups/CMakeLists.txt +++ b/src/effects/slidingpopups/CMakeLists.txt @@ -16,5 +16,5 @@ target_link_libraries(kwin4_effect_slidingpopups PRIVATE kwin kwineffects - KF5::ConfigGui + KF6::ConfigGui ) diff --git a/src/effects/thumbnailaside/CMakeLists.txt b/src/effects/thumbnailaside/CMakeLists.txt index 54ee6f0bb2..eae8b5fa29 100644 --- a/src/effects/thumbnailaside/CMakeLists.txt +++ b/src/effects/thumbnailaside/CMakeLists.txt @@ -15,9 +15,9 @@ target_link_libraries(kwin4_effect_thumbnailaside PRIVATE kwineffects kwinglutils - KF5::ConfigGui - KF5::GlobalAccel - KF5::I18n + KF6::ConfigGui + KF6::GlobalAccel + KF6::I18n ) ####################################### @@ -30,11 +30,11 @@ if (KWIN_BUILD_KCMS) kwin_add_effect_config(kwin_thumbnailaside_config ${kwin_thumbnailaside_config_SRCS}) target_link_libraries(kwin_thumbnailaside_config - KF5::ConfigWidgets - KF5::CoreAddons - KF5::GlobalAccel - KF5::I18n - KF5::XmlGui + KF6::ConfigWidgets + KF6::CoreAddons + KF6::GlobalAccel + KF6::I18n + KF6::XmlGui KWinEffectsInterface ) endif() diff --git a/src/effects/tileseditor/CMakeLists.txt b/src/effects/tileseditor/CMakeLists.txt index 8e7ded742d..166d07fa4b 100644 --- a/src/effects/tileseditor/CMakeLists.txt +++ b/src/effects/tileseditor/CMakeLists.txt @@ -16,9 +16,9 @@ kwin4_add_effect_module(kwin4_effect_tileseditor ${tileseditor_SOURCES}) target_link_libraries(kwin4_effect_tileseditor PRIVATE kwineffects - KF5::ConfigGui - KF5::GlobalAccel - KF5::I18n + KF6::ConfigGui + KF6::GlobalAccel + KF6::I18n Qt::Quick ) diff --git a/src/effects/tileseditor/kcm/CMakeLists.txt b/src/effects/tileseditor/kcm/CMakeLists.txt index aa03e81bd2..f6624ed843 100644 --- a/src/effects/tileseditor/kcm/CMakeLists.txt +++ b/src/effects/tileseditor/kcm/CMakeLists.txt @@ -7,10 +7,10 @@ ki18n_wrap_ui(kwin_tileseditor_config_SOURCES tileseditoreffectkcm.ui) kwin_add_effect_config(kwin_tileseditor_config ${kwin_tileseditor_config_SOURCES}) target_link_libraries(kwin_tileseditor_config - KF5::ConfigWidgets - KF5::CoreAddons - KF5::GlobalAccel - KF5::I18n - KF5::XmlGui + KF6::ConfigWidgets + KF6::CoreAddons + KF6::GlobalAccel + KF6::I18n + KF6::XmlGui KWinEffectsInterface ) diff --git a/src/effects/touchpoints/CMakeLists.txt b/src/effects/touchpoints/CMakeLists.txt index eef686adf0..90fcdf3d41 100644 --- a/src/effects/touchpoints/CMakeLists.txt +++ b/src/effects/touchpoints/CMakeLists.txt @@ -11,5 +11,5 @@ target_link_libraries(kwin4_effect_touchpoints PRIVATE kwineffects kwinglutils - KF5::GlobalAccel + KF6::GlobalAccel ) diff --git a/src/effects/trackmouse/CMakeLists.txt b/src/effects/trackmouse/CMakeLists.txt index a64197ce2c..931b7aae88 100644 --- a/src/effects/trackmouse/CMakeLists.txt +++ b/src/effects/trackmouse/CMakeLists.txt @@ -17,9 +17,9 @@ target_link_libraries(kwin4_effect_trackmouse PRIVATE kwineffects kwinglutils - KF5::ConfigGui - KF5::GlobalAccel - KF5::I18n + KF6::ConfigGui + KF6::GlobalAccel + KF6::I18n ) ####################################### @@ -32,11 +32,11 @@ if (KWIN_BUILD_KCMS) kwin_add_effect_config(kwin_trackmouse_config ${kwin_trackmouse_config_SRCS}) target_link_libraries(kwin_trackmouse_config - KF5::ConfigWidgets - KF5::CoreAddons - KF5::GlobalAccel - KF5::I18n - KF5::XmlGui + KF6::ConfigWidgets + KF6::CoreAddons + KF6::GlobalAccel + KF6::I18n + KF6::XmlGui KWinEffectsInterface ) endif() diff --git a/src/effects/windowview/CMakeLists.txt b/src/effects/windowview/CMakeLists.txt index c0c0090b89..0d91305174 100644 --- a/src/effects/windowview/CMakeLists.txt +++ b/src/effects/windowview/CMakeLists.txt @@ -22,9 +22,9 @@ kwin4_add_effect_module(kwin4_effect_windowview ${windowview_SOURCES}) target_link_libraries(kwin4_effect_windowview PRIVATE kwineffects - KF5::ConfigGui - KF5::GlobalAccel - KF5::I18n + KF6::ConfigGui + KF6::GlobalAccel + KF6::I18n Qt::Quick ) diff --git a/src/effects/windowview/kcm/CMakeLists.txt b/src/effects/windowview/kcm/CMakeLists.txt index dea139fa26..8f8310e22d 100644 --- a/src/effects/windowview/kcm/CMakeLists.txt +++ b/src/effects/windowview/kcm/CMakeLists.txt @@ -8,10 +8,10 @@ kconfig_add_kcfg_files(kwin_windowview_config_SOURCES ../windowviewconfig.kcfgc) kwin_add_effect_config(kwin_windowview_config ${kwin_windowview_config_SOURCES}) target_link_libraries(kwin_windowview_config - KF5::ConfigWidgets - KF5::CoreAddons - KF5::GlobalAccel - KF5::I18n - KF5::XmlGui + KF6::ConfigWidgets + KF6::CoreAddons + KF6::GlobalAccel + KF6::I18n + KF6::XmlGui KWinEffectsInterface ) diff --git a/src/effects/wobblywindows/CMakeLists.txt b/src/effects/wobblywindows/CMakeLists.txt index e583923f37..b9ce8335f1 100644 --- a/src/effects/wobblywindows/CMakeLists.txt +++ b/src/effects/wobblywindows/CMakeLists.txt @@ -14,7 +14,7 @@ kwin4_add_effect_module(kwin4_effect_wobblywindows ${wobblywindows_SOURCES}) target_link_libraries(kwin4_effect_wobblywindows PRIVATE kwineffects - KF5::ConfigGui + KF6::ConfigGui ) ####################################### @@ -27,9 +27,9 @@ if (KWIN_BUILD_KCMS) kwin_add_effect_config(kwin_wobblywindows_config ${kwin_wobblywindows_config_SRCS}) target_link_libraries(kwin_wobblywindows_config - KF5::ConfigWidgets - KF5::CoreAddons - KF5::I18n + KF6::ConfigWidgets + KF6::CoreAddons + KF6::I18n Qt::DBus KWinEffectsInterface ) diff --git a/src/effects/zoom/CMakeLists.txt b/src/effects/zoom/CMakeLists.txt index cb63006b63..5f06ff6ec2 100644 --- a/src/effects/zoom/CMakeLists.txt +++ b/src/effects/zoom/CMakeLists.txt @@ -21,10 +21,10 @@ target_link_libraries(kwin4_effect_zoom PRIVATE kwineffects kwinglutils - KF5::ConfigGui - KF5::ConfigWidgets - KF5::GlobalAccel - KF5::I18n + KF6::ConfigGui + KF6::ConfigWidgets + KF6::GlobalAccel + KF6::I18n ) if (HAVE_ACCESSIBILITY) @@ -42,11 +42,11 @@ if (KWIN_BUILD_KCMS) kwin_add_effect_config(kwin_zoom_config ${kwin_zoom_config_SRCS}) target_link_libraries(kwin_zoom_config - KF5::ConfigWidgets - KF5::CoreAddons - KF5::GlobalAccel - KF5::I18n - KF5::XmlGui + KF6::ConfigWidgets + KF6::CoreAddons + KF6::GlobalAccel + KF6::I18n + KF6::XmlGui KWinEffectsInterface ) endif() diff --git a/src/helpers/killer/CMakeLists.txt b/src/helpers/killer/CMakeLists.txt index ecd3703251..182788708d 100644 --- a/src/helpers/killer/CMakeLists.txt +++ b/src/helpers/killer/CMakeLists.txt @@ -5,9 +5,9 @@ set(kwin_killer_helper_SRCS killer.cpp) add_executable(kwin_killer_helper ${kwin_killer_helper_SRCS}) target_link_libraries(kwin_killer_helper - KF5::AuthCore - KF5::I18n - KF5::WidgetsAddons + KF6::AuthCore + KF6::I18n + KF6::WidgetsAddons Qt::Widgets ) if (QT_MAJOR_VERSION EQUAL "5") diff --git a/src/helpers/wayland_wrapper/CMakeLists.txt b/src/helpers/wayland_wrapper/CMakeLists.txt index ab012ef147..005d4de4b8 100644 --- a/src/helpers/wayland_wrapper/CMakeLists.txt +++ b/src/helpers/wayland_wrapper/CMakeLists.txt @@ -15,6 +15,6 @@ ecm_qt_declare_logging_category(kwin_wayland_wrapper Warning ) -target_link_libraries(kwin_wayland_wrapper Qt::Core Qt::DBus KF5::DBusAddons KF5::CoreAddons KWinXwaylandCommon) +target_link_libraries(kwin_wayland_wrapper Qt::Core Qt::DBus KF6::DBusAddons KF6::CoreAddons KWinXwaylandCommon) set_property(TARGET kwin_wayland_wrapper PROPERTY C_STANDARD 11) install(TARGETS kwin_wayland_wrapper ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/src/helpers/wayland_wrapper/kwin_wrapper.cpp b/src/helpers/wayland_wrapper/kwin_wrapper.cpp index c1ffd77b40..1fd7022159 100644 --- a/src/helpers/wayland_wrapper/kwin_wrapper.cpp +++ b/src/helpers/wayland_wrapper/kwin_wrapper.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include @@ -148,8 +148,8 @@ void KWinWrapper::run() } } - auto envSyncJob = new UpdateLaunchEnvironmentJob(env); - connect(envSyncJob, &UpdateLaunchEnvironmentJob::finished, this, []() { + auto envSyncJob = new KUpdateLaunchEnvironmentJob(env); + connect(envSyncJob, &KUpdateLaunchEnvironmentJob::finished, this, []() { // The service name is merely there to indicate to the world that we're up and ready with all envs exported QDBusConnection::sessionBus().registerService(QStringLiteral("org.kde.KWinWrapper")); }); diff --git a/src/kcms/common/CMakeLists.txt b/src/kcms/common/CMakeLists.txt index a585dc9357..48ad04ff9d 100644 --- a/src/kcms/common/CMakeLists.txt +++ b/src/kcms/common/CMakeLists.txt @@ -16,11 +16,11 @@ add_library(kcmkwincommon SHARED ${kcmkwincommon_SRC}) target_link_libraries(kcmkwincommon Qt::Core Qt::DBus - KF5::CoreAddons - KF5::ConfigCore - KF5::I18n - KF5::Package - KF5::KCMUtils + KF6::CoreAddons + KF6::ConfigCore + KF6::I18n + KF6::Package + KF6::KCMUtils ) set_target_properties(kcmkwincommon PROPERTIES diff --git a/src/kcms/compositing/CMakeLists.txt b/src/kcms/compositing/CMakeLists.txt index 89061097eb..bd44825c87 100644 --- a/src/kcms/compositing/CMakeLists.txt +++ b/src/kcms/compositing/CMakeLists.txt @@ -24,9 +24,9 @@ target_link_libraries(kwincompositing Qt::DBus Qt::Widgets - KF5::ConfigCore - KF5::CoreAddons - KF5::I18n - KF5::KCMUtils - KF5::WindowSystem + KF6::ConfigCore + KF6::CoreAddons + KF6::I18n + KF6::KCMUtils + KF6::WindowSystem ) diff --git a/src/kcms/decoration/CMakeLists.txt b/src/kcms/decoration/CMakeLists.txt index 886cb611b8..e35a62554c 100644 --- a/src/kcms/decoration/CMakeLists.txt +++ b/src/kcms/decoration/CMakeLists.txt @@ -25,10 +25,10 @@ kcmutils_generate_desktop_file(kcm_kwindecoration) target_link_libraries(kcm_kwindecoration KDecoration2::KDecoration - KF5::I18n - KF5::KCMUtils - KF5::NewStuff - KF5::QuickAddons + KF6::I18n + KF6::KCMUtils + KF6::NewStuff + KF6::QuickAddons Qt::Quick Qt::DBus ) @@ -45,8 +45,8 @@ add_executable(kwin-applywindowdecoration ${kwin-applywindowdecoration_SRCS}) target_link_libraries(kwin-applywindowdecoration KDecoration2::KDecoration Qt::DBus - KF5::I18n - KF5::KCMUtils + KF6::I18n + KF6::KCMUtils ) configure_file(window-decorations.knsrc.cmake ${CMAKE_CURRENT_BINARY_DIR}/window-decorations.knsrc) diff --git a/src/kcms/decoration/declarative-plugin/CMakeLists.txt b/src/kcms/decoration/declarative-plugin/CMakeLists.txt index b0def69a53..19e9663f0e 100644 --- a/src/kcms/decoration/declarative-plugin/CMakeLists.txt +++ b/src/kcms/decoration/declarative-plugin/CMakeLists.txt @@ -16,10 +16,10 @@ target_link_libraries(kdecorationprivatedeclarative KDecoration2::KDecoration2Private Qt::DBus Qt::Quick - KF5::CoreAddons - KF5::ConfigWidgets - KF5::I18n - KF5::Service + KF6::CoreAddons + KF6::ConfigWidgets + KF6::I18n + KF6::Service ) install(TARGETS kdecorationprivatedeclarative DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kwin/private/kdecoration ) diff --git a/src/kcms/desktop/CMakeLists.txt b/src/kcms/desktop/CMakeLists.txt index 3acd4513bf..9975399784 100644 --- a/src/kcms/desktop/CMakeLists.txt +++ b/src/kcms/desktop/CMakeLists.txt @@ -19,10 +19,10 @@ kcmutils_generate_desktop_file(kcm_kwin_virtualdesktops) target_link_libraries(kcm_kwin_virtualdesktops Qt::DBus - KF5::I18n - KF5::KCMUtils - KF5::QuickAddons - KF5::XmlGui + KF6::I18n + KF6::KCMUtils + KF6::QuickAddons + KF6::XmlGui kcmkwincommon ) diff --git a/src/kcms/effects/CMakeLists.txt b/src/kcms/effects/CMakeLists.txt index 1fefed5f82..79953a173a 100644 --- a/src/kcms/effects/CMakeLists.txt +++ b/src/kcms/effects/CMakeLists.txt @@ -15,12 +15,12 @@ kcmutils_generate_desktop_file(kcm_kwin_effects) target_link_libraries(kcm_kwin_effects Qt::DBus - KF5::KCMUtils - KF5::I18n - KF5::KCMUtils - KF5::NewStuff - KF5::QuickAddons - KF5::XmlGui + KF6::KCMUtils + KF6::I18n + KF6::KCMUtils + KF6::NewStuff + KF6::QuickAddons + KF6::XmlGui kcmkwincommon ) diff --git a/src/kcms/options/CMakeLists.txt b/src/kcms/options/CMakeLists.txt index 2b385bade8..393df0c5cf 100644 --- a/src/kcms/options/CMakeLists.txt +++ b/src/kcms/options/CMakeLists.txt @@ -31,4 +31,4 @@ qt_add_dbus_interface(kcm_kwinoptions_PART_SRCS ${KWin_SOURCE_DIR}/src/org.kde.k kcoreaddons_add_plugin(kcm_kwinoptions SOURCES ${kcm_kwinoptions_PART_SRCS} INSTALL_NAMESPACE "plasma/kcms/systemsettings_qwidgets") kcmutils_generate_desktop_file(kcm_kwinoptions) -target_link_libraries(kcm_kwinoptions kwin Qt::DBus KF5::KCMUtils KF5::I18n KF5::ConfigWidgets KF5::WindowSystem) +target_link_libraries(kcm_kwinoptions kwin Qt::DBus KF6::KCMUtils KF6::I18n KF6::ConfigWidgets KF6::WindowSystem) diff --git a/src/kcms/rules/CMakeLists.txt b/src/kcms/rules/CMakeLists.txt index cc13c0a241..aa43cd80bc 100644 --- a/src/kcms/rules/CMakeLists.txt +++ b/src/kcms/rules/CMakeLists.txt @@ -31,15 +31,15 @@ set(kwin_kcm_rules_XCB_LIBS set(kcm_libs Qt::Quick - KF5::KCMUtils - KF5::I18n - KF5::QuickAddons - KF5::WindowSystem - KF5::XmlGui + KF6::KCMUtils + KF6::I18n + KF6::QuickAddons + KF6::WindowSystem + KF6::XmlGui ) if (KWIN_BUILD_ACTIVITIES) - set(kcm_libs ${kcm_libs} KF5::Activities) + set(kcm_libs ${kcm_libs} KF6::Activities) endif() target_link_libraries(KWinRulesObjects ${kcm_libs} ${kwin_kcm_rules_XCB_LIBS}) diff --git a/src/kcms/screenedges/CMakeLists.txt b/src/kcms/screenedges/CMakeLists.txt index baf1f7a03f..392dfe1be4 100644 --- a/src/kcms/screenedges/CMakeLists.txt +++ b/src/kcms/screenedges/CMakeLists.txt @@ -28,12 +28,12 @@ kcoreaddons_add_plugin(kcm_kwinscreenedges SOURCES ${kcm_kwinscreenedges_PART_SR set(kcm_screenedges_LIBS Qt::DBus - KF5::ConfigCore - KF5::ConfigWidgets - KF5::KCMUtils - KF5::I18n - KF5::Package - KF5::Plasma + KF6::ConfigCore + KF6::ConfigWidgets + KF6::KCMUtils + KF6::I18n + KF6::Package + KF6::Plasma ) target_link_libraries(kcm_kwinscreenedges ${X11_LIBRARIES} ${kcm_screenedges_LIBS}) diff --git a/src/kcms/scripts/CMakeLists.txt b/src/kcms/scripts/CMakeLists.txt index 66966d6d46..57b2cc2af8 100644 --- a/src/kcms/scripts/CMakeLists.txt +++ b/src/kcms/scripts/CMakeLists.txt @@ -12,13 +12,13 @@ target_sources(kcm_kwin_scripts PRIVATE target_link_libraries(kcm_kwin_scripts Qt::DBus - KF5::I18n - KF5::KCMUtilsCore - KF5::KCMUtils - KF5::NewStuffWidgets - KF5::Package - KF5::QuickAddons - KF5::ItemViews + KF6::I18n + KF6::KCMUtilsCore + KF6::KCMUtils + KF6::NewStuffWidgets + KF6::Package + KF6::QuickAddons + KF6::ItemViews ) kpackage_install_package(package kcm_kwin_scripts kcms) diff --git a/src/kcms/tabbox/CMakeLists.txt b/src/kcms/tabbox/CMakeLists.txt index f0a06e59be..d931981bb2 100644 --- a/src/kcms/tabbox/CMakeLists.txt +++ b/src/kcms/tabbox/CMakeLists.txt @@ -24,12 +24,12 @@ kcoreaddons_add_plugin(kcm_kwintabbox SOURCES ${kcm_kwintabbox_PART_SRCS} INSTAL kcmutils_generate_desktop_file(kcm_kwintabbox) target_link_libraries(kcm_kwintabbox Qt::Quick - KF5::GlobalAccel - KF5::I18n - KF5::KCMUtils - KF5::NewStuffWidgets - KF5::Package - KF5::XmlGui # For kkeysequencewidget + KF6::GlobalAccel + KF6::I18n + KF6::KCMUtils + KF6::NewStuffWidgets + KF6::Package + KF6::XmlGui # For kkeysequencewidget XCB::XCB ) diff --git a/src/kcms/virtualkeyboard/CMakeLists.txt b/src/kcms/virtualkeyboard/CMakeLists.txt index 966ca4b01f..a02ab07cdd 100644 --- a/src/kcms/virtualkeyboard/CMakeLists.txt +++ b/src/kcms/virtualkeyboard/CMakeLists.txt @@ -17,10 +17,10 @@ target_include_directories(kcm_virtualkeyboard PRIVATE ${CMAKE_SOURCE_DIR}) kcmutils_generate_desktop_file(kcm_virtualkeyboard) target_link_libraries(kcm_virtualkeyboard - KF5::I18n - KF5::KCMUtils - KF5::Service - KF5::QuickAddons + KF6::I18n + KF6::KCMUtils + KF6::Service + KF6::QuickAddons ) kpackage_install_package(package kcm_virtualkeyboard kcms) diff --git a/src/kcms/xwayland/CMakeLists.txt b/src/kcms/xwayland/CMakeLists.txt index 37deb40213..1d5eb1f81e 100644 --- a/src/kcms/xwayland/CMakeLists.txt +++ b/src/kcms/xwayland/CMakeLists.txt @@ -17,9 +17,9 @@ target_include_directories(kcm_kwinxwayland PRIVATE ${CMAKE_SOURCE_DIR}) kcmutils_generate_desktop_file(kcm_kwinxwayland) target_link_libraries(kcm_kwinxwayland - KF5::I18n - KF5::KCMUtils - KF5::QuickAddons + KF6::I18n + KF6::KCMUtils + KF6::QuickAddons Wayland::Client ) kpackage_install_package(package kcm_kwinxwayland kcms) diff --git a/src/libkwineffects/CMakeLists.txt b/src/libkwineffects/CMakeLists.txt index fba4bd1913..a49cde8534 100644 --- a/src/libkwineffects/CMakeLists.txt +++ b/src/libkwineffects/CMakeLists.txt @@ -37,13 +37,13 @@ add_library(kwineffects SHARED ${kwin_EFFECTSLIB_SRCS}) generate_export_header(kwineffects EXPORT_FILE_NAME kwineffects_export.h) target_link_libraries(kwineffects PUBLIC - KF5::ConfigCore - KF5::CoreAddons - KF5::WindowSystem + KF6::ConfigCore + KF6::CoreAddons + KF6::WindowSystem XCB::XCB PRIVATE Qt::Quick - KF5::I18n + KF6::I18n kwinglutils ) if (QT_MAJOR_VERSION EQUAL "6") @@ -68,7 +68,7 @@ set(kwin_GLUTILSLIB_SRCS add_library(kwinglutils SHARED ${kwin_GLUTILSLIB_SRCS}) generate_export_header(kwinglutils BASE_NAME kwinglutils EXPORT_FILE_NAME kwinglutils_export.h) -target_link_libraries(kwinglutils PUBLIC XCB::XCB KF5::CoreAddons KF5::ConfigCore KF5::WindowSystem epoxy::epoxy) +target_link_libraries(kwinglutils PUBLIC XCB::XCB KF6::CoreAddons KF6::ConfigCore KF6::WindowSystem epoxy::epoxy) set_target_properties(kwinglutils PROPERTIES VERSION ${KWINEFFECTS_VERSION} SOVERSION ${KWINEFFECTS_SOVERSION} diff --git a/src/libkwineffects/KWinEffectsConfig.cmake.in b/src/libkwineffects/KWinEffectsConfig.cmake.in index 612636e21e..8cc0b1e7ce 100644 --- a/src/libkwineffects/KWinEffectsConfig.cmake.in +++ b/src/libkwineffects/KWinEffectsConfig.cmake.in @@ -3,9 +3,9 @@ include(CMakeFindDependencyMacro) find_dependency(Qt@QT_MAJOR_VERSION@Core "@QT_MIN_VERSION@") find_dependency(Qt@QT_MAJOR_VERSION@Gui "@QT_MIN_VERSION@") -find_dependency(KF5Config "@KF5_MIN_VERSION@") -find_dependency(KF5CoreAddons "@KF5_MIN_VERSION@") -find_dependency(KF5WindowSystem "@KF5_MIN_VERSION@") +find_dependency(KF6Config "@KF6_MIN_VERSION@") +find_dependency(KF6CoreAddons "@KF6_MIN_VERSION@") +find_dependency(KF6WindowSystem "@KF6_MIN_VERSION@") @PACKAGE_SETUP_AUTOMOC_VARIABLES@ include("${CMAKE_CURRENT_LIST_DIR}/KWinEffectsTargets.cmake") diff --git a/src/plugins/buttonrebinds/CMakeLists.txt b/src/plugins/buttonrebinds/CMakeLists.txt index c60db5dfa6..f4ed530f2f 100644 --- a/src/plugins/buttonrebinds/CMakeLists.txt +++ b/src/plugins/buttonrebinds/CMakeLists.txt @@ -14,5 +14,5 @@ target_sources(MouseButtonToKeyPlugin PRIVATE main.cpp buttonrebindsfilter.cpp ) -target_link_libraries(MouseButtonToKeyPlugin PRIVATE kwin KF5::WindowSystem) +target_link_libraries(MouseButtonToKeyPlugin PRIVATE kwin KF6::WindowSystem) diff --git a/src/plugins/idletime/CMakeLists.txt b/src/plugins/idletime/CMakeLists.txt index c0453940cd..4f090d445a 100644 --- a/src/plugins/idletime/CMakeLists.txt +++ b/src/plugins/idletime/CMakeLists.txt @@ -2,10 +2,10 @@ set(idletime_plugin_SRCS poller.cpp ) -add_library(KF5IdleTimeKWinPlugin OBJECT ${idletime_plugin_SRCS}) -set_property(TARGET KF5IdleTimeKWinPlugin PROPERTY POSITION_INDEPENDENT_CODE ON) -target_compile_definitions(KF5IdleTimeKWinPlugin PRIVATE QT_STATICPLUGIN) -target_link_libraries(KF5IdleTimeKWinPlugin - KF5::IdleTime +add_library(KF6IdleTimeKWinPlugin OBJECT ${idletime_plugin_SRCS}) +set_property(TARGET KF6IdleTimeKWinPlugin PROPERTY POSITION_INDEPENDENT_CODE ON) +target_compile_definitions(KF6IdleTimeKWinPlugin PRIVATE QT_STATICPLUGIN) +target_link_libraries(KF6IdleTimeKWinPlugin + KF6::IdleTime kwin ) diff --git a/src/plugins/kdecorations/aurorae/src/CMakeLists.txt b/src/plugins/kdecorations/aurorae/src/CMakeLists.txt index e5f929219c..9425c03911 100644 --- a/src/plugins/kdecorations/aurorae/src/CMakeLists.txt +++ b/src/plugins/kdecorations/aurorae/src/CMakeLists.txt @@ -21,10 +21,10 @@ set_target_properties(kwin5_aurorae PROPERTIES target_link_libraries(kwin5_aurorae KDecoration2::KDecoration kwineffects - KF5::ConfigWidgets - KF5::I18n - KF5::Package - KF5::WindowSystem + KF6::ConfigWidgets + KF6::I18n + KF6::Package + KF6::WindowSystem Qt::Quick Qt::UiTools ) @@ -41,7 +41,7 @@ add_library(decorationplugin SHARED ${decoration_plugin_SRCS}) set_target_properties(decorationplugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/org/kde/kwin/decoration/") target_link_libraries(decorationplugin KDecoration2::KDecoration - KF5::ConfigWidgets + KF6::ConfigWidgets Qt::Quick ) install(TARGETS decorationplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kwin/decoration) diff --git a/src/plugins/kdecorations/aurorae/themes/plastik/code/CMakeLists.txt b/src/plugins/kdecorations/aurorae/themes/plastik/code/CMakeLists.txt index 71366d4240..1ac1de1bf5 100644 --- a/src/plugins/kdecorations/aurorae/themes/plastik/code/CMakeLists.txt +++ b/src/plugins/kdecorations/aurorae/themes/plastik/code/CMakeLists.txt @@ -5,7 +5,7 @@ set(plastik_plugin_SRCS add_library(plastikplugin SHARED ${plastik_plugin_SRCS}) set_target_properties(plastikplugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/org/kde/kwin/decorations/plastik") -target_link_libraries(plastikplugin Qt::Core Qt::Quick KF5::ConfigWidgets) +target_link_libraries(plastikplugin Qt::Core Qt::Quick KF6::ConfigWidgets) install(TARGETS plastikplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kwin/decorations/plastik) install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kwin/decorations/plastik) file(COPY qmldir DESTINATION ${CMAKE_BINARY_DIR}/bin/org/kde/kwin/decorations/plastik) diff --git a/src/plugins/kglobalaccel/CMakeLists.txt b/src/plugins/kglobalaccel/CMakeLists.txt index da62c939fd..c2bbb443d0 100644 --- a/src/plugins/kglobalaccel/CMakeLists.txt +++ b/src/plugins/kglobalaccel/CMakeLists.txt @@ -2,7 +2,7 @@ set(kglobalaccel_plugin_SRCS kglobalaccel_plugin.cpp ) -add_library(KF5GlobalAccelKWinPlugin OBJECT ${kglobalaccel_plugin_SRCS}) -set_property(TARGET KF5GlobalAccelKWinPlugin PROPERTY POSITION_INDEPENDENT_CODE ON) -target_compile_definitions(KF5GlobalAccelKWinPlugin PRIVATE QT_STATICPLUGIN) -target_link_libraries(KF5GlobalAccelKWinPlugin KF5::GlobalAccelPrivate kwin) +add_library(KF6GlobalAccelKWinPlugin OBJECT ${kglobalaccel_plugin_SRCS}) +set_property(TARGET KF6GlobalAccelKWinPlugin PROPERTY POSITION_INDEPENDENT_CODE ON) +target_compile_definitions(KF6GlobalAccelKWinPlugin PRIVATE QT_STATICPLUGIN) +target_link_libraries(KF6GlobalAccelKWinPlugin KF6::GlobalAccelPrivate kwin) diff --git a/src/plugins/kpackage/aurorae/CMakeLists.txt b/src/plugins/kpackage/aurorae/CMakeLists.txt index bce82f4d56..bc270727a5 100644 --- a/src/plugins/kpackage/aurorae/CMakeLists.txt +++ b/src/plugins/kpackage/aurorae/CMakeLists.txt @@ -3,7 +3,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kwin_package_aurorae\") kcoreaddons_add_plugin(kwin_packagestructure_aurorae SOURCES aurorae.cpp INSTALL_NAMESPACE "kpackage/packagestructure") target_link_libraries(kwin_packagestructure_aurorae - KF5::I18n - KF5::Package + KF6::I18n + KF6::Package ) set_target_properties(kwin_packagestructure_aurorae PROPERTIES OUTPUT_NAME kwin_aurorae) diff --git a/src/plugins/kpackage/decoration/CMakeLists.txt b/src/plugins/kpackage/decoration/CMakeLists.txt index 483d2a6dc1..bbf11a21b0 100644 --- a/src/plugins/kpackage/decoration/CMakeLists.txt +++ b/src/plugins/kpackage/decoration/CMakeLists.txt @@ -3,7 +3,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kwin_package_decoration\") kcoreaddons_add_plugin(kwin_packagestructure_decoration SOURCES decoration.cpp INSTALL_NAMESPACE "kpackage/packagestructure") target_link_libraries(kwin_packagestructure_decoration - KF5::I18n - KF5::Package + KF6::I18n + KF6::Package ) set_target_properties(kwin_packagestructure_decoration PROPERTIES OUTPUT_NAME kwin_decoration) diff --git a/src/plugins/kpackage/effect/CMakeLists.txt b/src/plugins/kpackage/effect/CMakeLists.txt index f24b3b5485..3a55f12fad 100644 --- a/src/plugins/kpackage/effect/CMakeLists.txt +++ b/src/plugins/kpackage/effect/CMakeLists.txt @@ -3,7 +3,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kwin_package_effect\") kcoreaddons_add_plugin(kwin_packagestructure_effect SOURCES effect.cpp INSTALL_NAMESPACE "kpackage/packagestructure") target_link_libraries(kwin_packagestructure_effect - KF5::I18n - KF5::Package + KF6::I18n + KF6::Package ) set_target_properties(kwin_packagestructure_effect PROPERTIES OUTPUT_NAME kwin_effect) diff --git a/src/plugins/kpackage/scripts/CMakeLists.txt b/src/plugins/kpackage/scripts/CMakeLists.txt index ce024cf93d..472a6bd3de 100644 --- a/src/plugins/kpackage/scripts/CMakeLists.txt +++ b/src/plugins/kpackage/scripts/CMakeLists.txt @@ -3,7 +3,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kwin_package_scripts\") kcoreaddons_add_plugin(kwin_packagestructure_scripts SOURCES scripts.cpp INSTALL_NAMESPACE "kpackage/packagestructure") target_link_libraries(kwin_packagestructure_scripts - KF5::I18n - KF5::Package + KF6::I18n + KF6::Package ) set_target_properties(kwin_packagestructure_scripts PROPERTIES OUTPUT_NAME kwin_script) diff --git a/src/plugins/kpackage/windowswitcher/CMakeLists.txt b/src/plugins/kpackage/windowswitcher/CMakeLists.txt index fd40e611f8..2b45560844 100644 --- a/src/plugins/kpackage/windowswitcher/CMakeLists.txt +++ b/src/plugins/kpackage/windowswitcher/CMakeLists.txt @@ -3,7 +3,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kwin_package_windowswitcher\") kcoreaddons_add_plugin(kwin_packagestructure_windowswitcher SOURCES windowswitcher.cpp INSTALL_NAMESPACE "kpackage/packagestructure") target_link_libraries(kwin_packagestructure_windowswitcher - KF5::I18n - KF5::Package + KF6::I18n + KF6::Package ) set_target_properties(kwin_packagestructure_windowswitcher PROPERTIES OUTPUT_NAME kwin_windowswitcher) diff --git a/src/plugins/krunner-integration/CMakeLists.txt b/src/plugins/krunner-integration/CMakeLists.txt index d2dcee05c5..ecc4281352 100644 --- a/src/plugins/krunner-integration/CMakeLists.txt +++ b/src/plugins/krunner-integration/CMakeLists.txt @@ -6,7 +6,7 @@ set(krunnerintegration_SOURCES qt_add_dbus_adaptor(krunnerintegration_SOURCES org.kde.krunner1.xml windowsrunnerinterface.h KWin::WindowsRunner) add_library(krunnerintegration MODULE ${krunnerintegration_SOURCES}) -target_link_libraries(krunnerintegration kwin KF5::Runner) +target_link_libraries(krunnerintegration kwin KF6::Runner) install(TARGETS krunnerintegration DESTINATION ${KDE_INSTALL_PLUGINDIR}/kwin/plugins/) install(FILES kwin-runner-windows.desktop DESTINATION ${KDE_INSTALL_DATAROOTDIR}/krunner/dbusplugins) diff --git a/src/plugins/krunner-integration/dbusutils_p.h b/src/plugins/krunner-integration/dbusutils_p.h index a14e59c89a..568724dd5f 100644 --- a/src/plugins/krunner-integration/dbusutils_p.h +++ b/src/plugins/krunner-integration/dbusutils_p.h @@ -22,7 +22,7 @@ struct RemoteMatch QString id; QString text; QString iconName; - Plasma::QueryMatch::Type type = Plasma::QueryMatch::NoMatch; + KRunner::QueryMatch::Type type = KRunner::QueryMatch::NoMatch; qreal relevance = 0; QVariantMap properties; }; @@ -71,7 +71,7 @@ inline const QDBusArgument &operator>>(const QDBusArgument &argument, RemoteMatc argument >> match.iconName; uint type; argument >> type; - match.type = (Plasma::QueryMatch::Type)type; + match.type = (KRunner::QueryMatch::Type)type; argument >> match.relevance; argument >> match.properties; argument.endStructure(); diff --git a/src/plugins/krunner-integration/windowsrunnerinterface.cpp b/src/plugins/krunner-integration/windowsrunnerinterface.cpp index 6ec495de01..db4d945968 100644 --- a/src/plugins/krunner-integration/windowsrunnerinterface.cpp +++ b/src/plugins/krunner-integration/windowsrunnerinterface.cpp @@ -166,9 +166,9 @@ RemoteMatches WindowsRunner::Match(const QString &searchTerm) const QString appName = window->resourceClass(); const QString name = window->caption(); if (name.startsWith(term, Qt::CaseInsensitive) || appName.startsWith(term, Qt::CaseInsensitive)) { - matches << windowsMatch(window, action, 0.8, Plasma::QueryMatch::ExactMatch); + matches << windowsMatch(window, action, 0.8, KRunner::QueryMatch::ExactMatch); } else if ((name.contains(term, Qt::CaseInsensitive) || appName.contains(term, Qt::CaseInsensitive)) && actionSupported(window, action)) { - matches << windowsMatch(window, action, 0.7, Plasma::QueryMatch::PossibleMatch); + matches << windowsMatch(window, action, 0.7, KRunner::QueryMatch::PossibleMatch); } } @@ -183,7 +183,7 @@ RemoteMatches WindowsRunner::Match(const QString &searchTerm) continue; } if ((window->desktops().contains(desktop) || window->isOnAllDesktops()) && actionSupported(window, action)) { - matches << windowsMatch(window, action, 0.5, Plasma::QueryMatch::PossibleMatch); + matches << windowsMatch(window, action, 0.5, KRunner::QueryMatch::PossibleMatch); } } } @@ -245,7 +245,7 @@ RemoteMatch WindowsRunner::desktopMatch(const VirtualDesktop *desktop, const Win { RemoteMatch match; match.id = QString::number(action) + QLatin1Char('_') + desktop->id(); - match.type = Plasma::QueryMatch::ExactMatch; + match.type = KRunner::QueryMatch::ExactMatch; match.iconName = QStringLiteral("user-desktop"); match.text = desktop->name(); match.relevance = relevance; @@ -257,7 +257,7 @@ RemoteMatch WindowsRunner::desktopMatch(const VirtualDesktop *desktop, const Win return match; } -RemoteMatch WindowsRunner::windowsMatch(const Window *window, const WindowsRunnerAction action, qreal relevance, Plasma::QueryMatch::Type type) const +RemoteMatch WindowsRunner::windowsMatch(const Window *window, const WindowsRunnerAction action, qreal relevance, KRunner::QueryMatch::Type type) const { RemoteMatch match; match.id = QString::number((int)action) + QLatin1Char('_') + window->internalId().toString(); diff --git a/src/plugins/krunner-integration/windowsrunnerinterface.h b/src/plugins/krunner-integration/windowsrunnerinterface.h index b508c10856..c830383990 100644 --- a/src/plugins/krunner-integration/windowsrunnerinterface.h +++ b/src/plugins/krunner-integration/windowsrunnerinterface.h @@ -56,7 +56,7 @@ private: }; RemoteMatch desktopMatch(const VirtualDesktop *desktop, const WindowsRunnerAction action = ActivateDesktopAction, qreal relevance = 1.0) const; - RemoteMatch windowsMatch(const Window *window, const WindowsRunnerAction action = ActivateAction, qreal relevance = 1.0, Plasma::QueryMatch::Type type = Plasma::QueryMatch::ExactMatch) const; + RemoteMatch windowsMatch(const Window *window, const WindowsRunnerAction action = ActivateAction, qreal relevance = 1.0, KRunner::QueryMatch::Type type = KRunner::QueryMatch::ExactMatch) const; bool actionSupported(const Window *window, const WindowsRunnerAction action) const; }; } diff --git a/src/plugins/qpa/CMakeLists.txt b/src/plugins/qpa/CMakeLists.txt index 91fa22028d..3655e587b0 100644 --- a/src/plugins/qpa/CMakeLists.txt +++ b/src/plugins/qpa/CMakeLists.txt @@ -24,7 +24,7 @@ target_compile_definitions(KWinQpaPlugin PRIVATE QT_STATICPLUGIN) target_link_libraries(KWinQpaPlugin PRIVATE Qt::CorePrivate Qt::GuiPrivate - Freetype::Freetype # Must be after Qt5 platform support libs + Freetype::Freetype # Must be after Qt6 platform support libs Fontconfig::Fontconfig kwin ) diff --git a/src/plugins/windowsystem/CMakeLists.txt b/src/plugins/windowsystem/CMakeLists.txt index ac2c296eb7..d16e20037c 100644 --- a/src/plugins/windowsystem/CMakeLists.txt +++ b/src/plugins/windowsystem/CMakeLists.txt @@ -5,7 +5,7 @@ set(kwindowsystem_plugin_SRCS windowsystem.cpp ) -add_library(KF5WindowSystemKWinPlugin OBJECT ${kwindowsystem_plugin_SRCS}) -set_property(TARGET KF5WindowSystemKWinPlugin PROPERTY POSITION_INDEPENDENT_CODE ON) -target_compile_definitions(KF5WindowSystemKWinPlugin PRIVATE QT_STATICPLUGIN) -target_link_libraries(KF5WindowSystemKWinPlugin kwin) +add_library(KF6WindowSystemKWinPlugin OBJECT ${kwindowsystem_plugin_SRCS}) +set_property(TARGET KF6WindowSystemKWinPlugin PROPERTY POSITION_INDEPENDENT_CODE ON) +target_compile_definitions(KF6WindowSystemKWinPlugin PRIVATE QT_STATICPLUGIN) +target_link_libraries(KF6WindowSystemKWinPlugin kwin) diff --git a/src/plugins/windowsystem/windoweffects.cpp b/src/plugins/windowsystem/windoweffects.cpp index d211a1a392..c75686dfa8 100644 --- a/src/plugins/windowsystem/windoweffects.cpp +++ b/src/plugins/windowsystem/windoweffects.cpp @@ -69,31 +69,6 @@ void WindowEffects::slideWindow(WId id, KWindowEffects::SlideFromLocation locati w->setProperty("kwin_slide_offset", offset); } -#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 81) -QList WindowEffects::windowSizes(const QList &ids) -{ - return {}; -} -#endif - -#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 82) -void WindowEffects::presentWindows(WId controller, const QList &ids) -{ -} -#endif - -#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 82) -void WindowEffects::presentWindows(WId controller, int desktop) -{ -} -#endif - -#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 82) -void WindowEffects::highlightWindows(WId controller, const QList &ids) -{ -} -#endif - void WindowEffects::enableBlurBehind(WId window, bool enable, const QRegion ®ion) { auto w = findWindow(window); @@ -126,10 +101,4 @@ void WindowEffects::enableBackgroundContrast(WId window, bool enable, qreal cont } } -#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 67) -void WindowEffects::markAsDashboard(WId window) -{ -} -#endif - } diff --git a/src/plugins/windowsystem/windoweffects.h b/src/plugins/windowsystem/windoweffects.h index bb2c60c202..e76886edbb 100644 --- a/src/plugins/windowsystem/windoweffects.h +++ b/src/plugins/windowsystem/windoweffects.h @@ -19,19 +19,8 @@ public: bool isEffectAvailable(KWindowEffects::Effect effect) override; void slideWindow(WId id, KWindowEffects::SlideFromLocation location, int offset) override; -#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 81) - QList windowSizes(const QList &ids) override; -#endif -#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 82) - void presentWindows(WId controller, const QList &ids) override; - void presentWindows(WId controller, int desktop = NET::OnAllDesktops) override; - void highlightWindows(WId controller, const QList &ids) override; -#endif void enableBlurBehind(WId window, bool enable = true, const QRegion ®ion = QRegion()) override; void enableBackgroundContrast(WId window, bool enable = true, qreal contrast = 1, qreal intensity = 1, qreal saturation = 1, const QRegion ®ion = QRegion()) override; -#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 67) - void markAsDashboard(WId window) override; -#endif }; } diff --git a/src/plugins/windowsystem/windowsystem.cpp b/src/plugins/windowsystem/windowsystem.cpp index 9ffbbc04b6..d148aef83a 100644 --- a/src/plugins/windowsystem/windowsystem.cpp +++ b/src/plugins/windowsystem/windowsystem.cpp @@ -43,15 +43,6 @@ WId WindowSystem::activeWindow() return 0; } -bool WindowSystem::allowedActionsSupported() -{ - return false; -} - -void WindowSystem::allowExternalProcessWindowActivation(int pid) -{ -} - bool WindowSystem::compositingActive() { // wayland is always composited @@ -73,34 +64,11 @@ int WindowSystem::currentDesktop() return 0; } -#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 101) -void WindowSystem::demandAttention(WId win, bool set) -{ -} -#endif - QString WindowSystem::desktopName(int desktop) { return QString(); } -QPoint WindowSystem::desktopToViewport(int desktop, bool absolute) -{ - return QPoint(); -} - -#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 0) -WId WindowSystem::groupLeader(WId window) -{ - return 0; -} -#endif - -bool WindowSystem::icccmCompliantMappingState() -{ - return false; -} - QPixmap WindowSystem::icon(WId win, int width, int height, bool scale, int flags) { return QPixmap(); @@ -138,10 +106,6 @@ QString WindowSystem::readNameProperty(WId window, long unsigned int atom) return QString(); } -void WindowSystem::setBlockingCompositing(WId window, bool active) -{ -} - void WindowSystem::setCurrentDesktop(int desktop) { // KWin internal should not use KWindowSystem to set current desktop @@ -160,12 +124,6 @@ void WindowSystem::setStrut(WId win, int left, int right, int top, int bottom) { } -#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 101) -void WindowSystem::setIcons(WId win, const QPixmap &icon, const QPixmap &miniIcon) -{ -} -#endif - void WindowSystem::setOnActivities(WId win, const QStringList &activities) { } @@ -206,10 +164,6 @@ void WindowSystem::setType(WId win, NET::WindowType windowType) (*it)->setProperty("kwin_windowType", QVariant::fromValue(windowType)); } -void WindowSystem::setUserTime(WId win, long int time) -{ -} - bool WindowSystem::showingDesktop() { // KWin should not use KWindowSystem for showing desktop state @@ -222,18 +176,6 @@ QList WindowSystem::stackingOrder() return {}; } -#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 0) -WId WindowSystem::transientFor(WId window) -{ - return 0; -} -#endif - -int WindowSystem::viewportToDesktop(const QPoint &pos) -{ - return 0; -} - int WindowSystem::viewportWindowToDesktop(const QRect &r) { return 0; diff --git a/src/plugins/windowsystem/windowsystem.h b/src/plugins/windowsystem/windowsystem.h index 401968c5fc..eead9832fb 100644 --- a/src/plugins/windowsystem/windowsystem.h +++ b/src/plugins/windowsystem/windowsystem.h @@ -22,9 +22,6 @@ public: WId activeWindow() override; void activateWindow(WId win, long time) override; void forceActiveWindow(WId win, long time) override; -#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 101) - void demandAttention(WId win, bool set) override; -#endif bool compositingActive() override; int currentDesktop() override; int numberOfDesktops() override; @@ -32,14 +29,7 @@ public: void setOnAllDesktops(WId win, bool b) override; void setOnDesktop(WId win, int desktop) override; void setOnActivities(WId win, const QStringList &activities) override; -#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 0) - WId transientFor(WId window) override; - WId groupLeader(WId window) override; -#endif QPixmap icon(WId win, int width, int height, bool scale, int flags) override; -#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 101) - void setIcons(WId win, const QPixmap &icon, const QPixmap &miniIcon) override; -#endif void setType(WId win, NET::WindowType windowType) override; void setState(WId win, NET::States state) override; void clearState(WId win, NET::States state) override; @@ -47,26 +37,19 @@ public: void unminimizeWindow(WId win) override; void raiseWindow(WId win) override; void lowerWindow(WId win) override; - bool icccmCompliantMappingState() override; QRect workArea(int desktop) override; QRect workArea(const QList &excludes, int desktop) override; QString desktopName(int desktop) override; void setDesktopName(int desktop, const QString &name) override; bool showingDesktop() override; void setShowingDesktop(bool showing) override; - void setUserTime(WId win, long time) override; void setExtendedStrut(WId win, int left_width, int left_start, int left_end, int right_width, int right_start, int right_end, int top_width, int top_start, int top_end, int bottom_width, int bottom_start, int bottom_end) override; void setStrut(WId win, int left, int right, int top, int bottom) override; - bool allowedActionsSupported() override; QString readNameProperty(WId window, unsigned long atom) override; - void allowExternalProcessWindowActivation(int pid) override; - void setBlockingCompositing(WId window, bool active) override; bool mapViewport() override; - int viewportToDesktop(const QPoint &pos) override; int viewportWindowToDesktop(const QRect &r) override; - QPoint desktopToViewport(int desktop, bool absolute) override; QPoint constrainViewportRelativePosition(const QPoint &pos) override; void connectNotify(const QMetaMethod &signal) override; diff --git a/src/scripting/CMakeLists.txt b/src/scripting/CMakeLists.txt index 7de5abfb0d..f0f4bcbc14 100644 --- a/src/scripting/CMakeLists.txt +++ b/src/scripting/CMakeLists.txt @@ -3,8 +3,8 @@ if (KWIN_BUILD_KCMS) qt_add_dbus_interface(kcm_kwin4_genericscripted_SRCS ${kwin_effects_dbus_xml} kwineffects_interface) add_library(kcm_kwin4_genericscripted MODULE ${kcm_kwin4_genericscripted_SRCS}) target_link_libraries(kcm_kwin4_genericscripted - KF5::ConfigWidgets #KCModule - KF5::I18n + KF6::ConfigWidgets #KCModule + KF6::I18n Qt::DBus Qt::UiTools kwineffects diff --git a/src/scripting/genericscriptedconfig.cpp b/src/scripting/genericscriptedconfig.cpp index ef6a22c0a3..41711f28f9 100644 --- a/src/scripting/genericscriptedconfig.cpp +++ b/src/scripting/genericscriptedconfig.cpp @@ -26,7 +26,7 @@ namespace KWin { -QObject *GenericScriptedConfigFactory::create(const char *iface, QWidget *parentWidget, QObject *parent, const QVariantList &args, const QString &keyword) +QObject *GenericScriptedConfigFactory::create(const char *iface, QWidget *parentWidget, QObject *parent, const QVariantList &args) { // the plugin id is in the args when created by desktop effects kcm or EffectsModel in general QString pluginId = args.isEmpty() ? QString() : args.first().toString(); diff --git a/src/scripting/genericscriptedconfig.h b/src/scripting/genericscriptedconfig.h index ebc7c0d479..e2528778a1 100644 --- a/src/scripting/genericscriptedconfig.h +++ b/src/scripting/genericscriptedconfig.h @@ -25,7 +25,7 @@ class GenericScriptedConfigFactory : public KPluginFactory Q_INTERFACES(KPluginFactory) protected: - QObject *create(const char *iface, QWidget *parentWidget, QObject *parent, const QVariantList &args, const QString &keyword) override; + QObject *create(const char *iface, QWidget *parentWidget, QObject *parent, const QVariantList &args) override; }; class GenericScriptedConfig : public KCModule diff --git a/src/wayland/autotests/client/CMakeLists.txt b/src/wayland/autotests/client/CMakeLists.txt index b6e9210c7a..63c6a98193 100644 --- a/src/wayland/autotests/client/CMakeLists.txt +++ b/src/wayland/autotests/client/CMakeLists.txt @@ -6,7 +6,7 @@ set( testWaylandOutput_SRCS ../../tests/fakeoutput.cpp ) add_executable(testWaylandOutput ${testWaylandOutput_SRCS}) -target_link_libraries( testWaylandOutput Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client Wayland::Server) +target_link_libraries( testWaylandOutput Qt::Test Qt::Gui KF6::WaylandClient kwin Wayland::Client Wayland::Server) add_test(NAME kwayland-testWaylandOutput COMMAND testWaylandOutput) ecm_mark_as_test(testWaylandOutput) @@ -18,7 +18,7 @@ set( testWaylandSurface_SRCS ../../tests/fakeoutput.cpp ) add_executable(testWaylandSurface ${testWaylandSurface_SRCS}) -target_link_libraries( testWaylandSurface Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client Wayland::Server) +target_link_libraries( testWaylandSurface Qt::Test Qt::Gui KF6::WaylandClient kwin Wayland::Client Wayland::Server) add_test(NAME kwayland-testWaylandSurface COMMAND testWaylandSurface) ecm_mark_as_test(testWaylandSurface) @@ -39,7 +39,7 @@ else() ${WaylandProtocols_DATADIR}/unstable/pointer-gestures/pointer-gestures-unstable-v1.xml) endif() target_sources(testWaylandSeat PRIVATE ${testWaylandSeat_SRCS}) -target_link_libraries( testWaylandSeat Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client Wayland::Server) +target_link_libraries( testWaylandSeat Qt::Test Qt::Gui KF6::WaylandClient kwin Wayland::Client Wayland::Server) add_test(NAME kwayland-testWaylandSeat COMMAND testWaylandSeat) ecm_mark_as_test(testWaylandSeat) @@ -50,7 +50,7 @@ set( testShmPool_SRCS test_shm_pool.cpp ) add_executable(testShmPool ${testShmPool_SRCS}) -target_link_libraries( testShmPool Qt::Test Qt::Gui KF5::WaylandClient kwin) +target_link_libraries( testShmPool Qt::Test Qt::Gui KF6::WaylandClient kwin) add_test(NAME kwayland-testShmPool COMMAND testShmPool) ecm_mark_as_test(testShmPool) @@ -61,7 +61,7 @@ set( testSubSurface_SRCS test_wayland_subsurface.cpp ) add_executable(testSubSurface ${testSubSurface_SRCS}) -target_link_libraries( testSubSurface Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client) +target_link_libraries( testSubSurface Qt::Test Qt::Gui KF6::WaylandClient kwin Wayland::Client) add_test(NAME kwayland-testSubSurface COMMAND testSubSurface) ecm_mark_as_test(testSubSurface) @@ -72,7 +72,7 @@ set( testBlur_SRCS test_wayland_blur.cpp ) add_executable(testBlur ${testBlur_SRCS}) -target_link_libraries( testBlur Qt::Test Qt::Gui KF5::WaylandClient kwin) +target_link_libraries( testBlur Qt::Test Qt::Gui KF6::WaylandClient kwin) add_test(NAME kwayland-testBlur COMMAND testBlur) ecm_mark_as_test(testBlur) @@ -83,7 +83,7 @@ set( testContrast_SRCS test_wayland_contrast.cpp ) add_executable(testContrast ${testContrast_SRCS}) -target_link_libraries( testContrast Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client) +target_link_libraries( testContrast Qt::Test Qt::Gui KF6::WaylandClient kwin Wayland::Client) add_test(NAME kwayland-testContrast COMMAND testContrast) ecm_mark_as_test(testContrast) @@ -94,7 +94,7 @@ set( testSlide_SRCS test_wayland_slide.cpp ) add_executable(testSlide ${testSlide_SRCS}) -target_link_libraries( testSlide Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client) +target_link_libraries( testSlide Qt::Test Qt::Gui KF6::WaylandClient kwin Wayland::Client) add_test(NAME kwayland-testSlide COMMAND testSlide) ecm_mark_as_test(testSlide) @@ -105,7 +105,7 @@ set( testWindowmanagement_SRCS test_wayland_windowmanagement.cpp ) add_executable(testWindowmanagement ${testWindowmanagement_SRCS}) -target_link_libraries( testWindowmanagement Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client) +target_link_libraries( testWindowmanagement Qt::Test Qt::Gui KF6::WaylandClient kwin Wayland::Client) add_test(NAME kwayland-testWindowmanagement COMMAND testWindowmanagement) ecm_mark_as_test(testWindowmanagement) @@ -116,7 +116,7 @@ set( testDataSource_SRCS test_datasource.cpp ) add_executable(testDataSource ${testDataSource_SRCS}) -target_link_libraries( testDataSource Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client) +target_link_libraries( testDataSource Qt::Test Qt::Gui KF6::WaylandClient kwin Wayland::Client) add_test(NAME kwayland-testDataSource COMMAND testDataSource) ecm_mark_as_test(testDataSource) @@ -127,7 +127,7 @@ set( testDataDevice_SRCS test_datadevice.cpp ) add_executable(testDataDevice ${testDataDevice_SRCS}) -target_link_libraries( testDataDevice Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client) +target_link_libraries( testDataDevice Qt::Test Qt::Gui KF6::WaylandClient kwin Wayland::Client) add_test(NAME kwayland-testDataDevice COMMAND testDataDevice) ecm_mark_as_test(testDataDevice) @@ -138,7 +138,7 @@ set( testServerSideDecoration_SRCS test_server_side_decoration.cpp ) add_executable(testServerSideDecoration ${testServerSideDecoration_SRCS}) -target_link_libraries( testServerSideDecoration Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client) +target_link_libraries( testServerSideDecoration Qt::Test Qt::Gui KF6::WaylandClient kwin Wayland::Client) add_test(NAME kwayland-testServerSideDecoration COMMAND testServerSideDecoration) ecm_mark_as_test(testServerSideDecoration) @@ -149,7 +149,7 @@ set( testDragAndDrop_SRCS test_drag_drop.cpp ) add_executable(testDragAndDrop ${testDragAndDrop_SRCS}) -target_link_libraries( testDragAndDrop Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client) +target_link_libraries( testDragAndDrop Qt::Test Qt::Gui KF6::WaylandClient kwin Wayland::Client) add_test(NAME kwayland-testDragAndDrop COMMAND testDragAndDrop) ecm_mark_as_test(testDragAndDrop) @@ -160,7 +160,7 @@ set( testPlasmaShell_SRCS test_plasmashell.cpp ) add_executable(testPlasmaShell ${testPlasmaShell_SRCS}) -target_link_libraries( testPlasmaShell Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client) +target_link_libraries( testPlasmaShell Qt::Test Qt::Gui KF6::WaylandClient kwin Wayland::Client) add_test(NAME kwayland-testPlasmaShell COMMAND testPlasmaShell) ecm_mark_as_test(testPlasmaShell) @@ -171,7 +171,7 @@ set( testShadow_SRCS test_shadow.cpp ) add_executable(testShadow ${testShadow_SRCS}) -target_link_libraries( testShadow Qt::Test Qt::Gui KF5::WaylandClient kwin) +target_link_libraries( testShadow Qt::Test Qt::Gui KF6::WaylandClient kwin) add_test(NAME kwayland-testShadow COMMAND testShadow) ecm_mark_as_test(testShadow) @@ -182,7 +182,7 @@ set( testFakeInput_SRCS test_fake_input.cpp ) add_executable(testFakeInput ${testFakeInput_SRCS}) -target_link_libraries( testFakeInput Qt::Test Qt::Gui KF5::WaylandClient kwin) +target_link_libraries( testFakeInput Qt::Test Qt::Gui KF6::WaylandClient kwin) add_test(NAME kwayland-testFakeInput COMMAND testFakeInput) ecm_mark_as_test(testFakeInput) @@ -193,7 +193,7 @@ set( testTextInputV2_SRCS test_text_input_v2.cpp ) add_executable(testTextInputV2 ${testTextInputV2_SRCS}) -target_link_libraries( testTextInputV2 Qt::Test Qt::Gui KF5::WaylandClient kwin) +target_link_libraries( testTextInputV2 Qt::Test Qt::Gui KF6::WaylandClient kwin) add_test(NAME kwayland-testTextInputV2 COMMAND testTextInputV2) ecm_mark_as_test(testTextInputV2) @@ -204,7 +204,7 @@ set( testError_SRCS test_error.cpp ) add_executable(testError ${testError_SRCS}) -target_link_libraries( testError Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client) +target_link_libraries( testError Qt::Test Qt::Gui KF6::WaylandClient kwin Wayland::Client) add_test(NAME kwayland-testError COMMAND testError) ecm_mark_as_test(testError) @@ -215,7 +215,7 @@ set( testSelection_SRCS test_selection.cpp ) add_executable(testSelection ${testSelection_SRCS}) -target_link_libraries( testSelection Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client) +target_link_libraries( testSelection Qt::Test Qt::Gui KF6::WaylandClient kwin Wayland::Client) add_test(NAME kwayland-testSelection COMMAND testSelection) ecm_mark_as_test(testSelection) @@ -226,7 +226,7 @@ set( testXdgForeign_SRCS test_xdg_foreign.cpp ) add_executable(testXdgForeign ${testXdgForeign_SRCS}) -target_link_libraries( testXdgForeign Qt::Test Qt::Gui kwin KF5::WaylandClient Wayland::Client) +target_link_libraries( testXdgForeign Qt::Test Qt::Gui kwin KF6::WaylandClient Wayland::Client) add_test(NAME kwayland-testXdgForeign COMMAND testXdgForeign) ecm_mark_as_test(testXdgForeign) @@ -235,7 +235,7 @@ ecm_mark_as_test(testXdgForeign) ######################################################## set(testXdgShell_SRCS test_xdg_shell.cpp ../../tests/fakeoutput.cpp) add_executable(testXdgShell ${testXdgShell_SRCS}) -target_link_libraries( testXdgShell Qt::Test Qt::Gui kwin KF5::WaylandClient Wayland::Client) +target_link_libraries( testXdgShell Qt::Test Qt::Gui kwin KF6::WaylandClient Wayland::Client) add_test(NAME kwayland-testXdgShell COMMAND testXdgShell) ecm_mark_as_test(testXdgShell) @@ -243,7 +243,7 @@ ecm_mark_as_test(testXdgShell) # Test Pointer Constraints ######################################################## add_executable(testPointerConstraintsInterface test_pointer_constraints.cpp) -target_link_libraries( testPointerConstraintsInterface Qt::Test Qt::Gui kwin KF5::WaylandClient Wayland::Client) +target_link_libraries( testPointerConstraintsInterface Qt::Test Qt::Gui kwin KF6::WaylandClient Wayland::Client) add_test(NAME kwayland-testPointerConstraintsInterface COMMAND testPointerConstraintsInterface) ecm_mark_as_test(testPointerConstraintsInterface) @@ -255,7 +255,7 @@ set( testFilter_SRCS test_wayland_filter.cpp ) add_executable(testFilter ${testFilter_SRCS}) -target_link_libraries( testFilter Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Server) +target_link_libraries( testFilter Qt::Test Qt::Gui KF6::WaylandClient kwin Wayland::Server) add_test(NAME kwayland-testFilter COMMAND testFilter) ecm_mark_as_test(testFilter) @@ -266,7 +266,7 @@ set( testAppmenu_SRCS test_wayland_appmenu.cpp ) add_executable(testAppmenu ${testAppmenu_SRCS}) -target_link_libraries( testAppmenu Qt::Test Qt::Gui KF5::WaylandClient kwin) +target_link_libraries( testAppmenu Qt::Test Qt::Gui KF6::WaylandClient kwin) add_test(NAME kwayland-testAppmenu COMMAND testAppmenu) ecm_mark_as_test(testAppmenu) @@ -277,7 +277,7 @@ set( testServerSideDecorationPalette_SRCS test_server_side_decoration_palette.cpp ) add_executable(testServerSideDecorationPalette ${testServerSideDecorationPalette_SRCS}) -target_link_libraries( testServerSideDecorationPalette Qt::Test Qt::Gui KF5::WaylandClient kwin) +target_link_libraries( testServerSideDecorationPalette Qt::Test Qt::Gui KF6::WaylandClient kwin) add_test(NAME kwayland-testServerSideDecorationPalette COMMAND testServerSideDecorationPalette) ecm_mark_as_test(testServerSideDecorationPalette) @@ -288,7 +288,7 @@ set( testPlasmaVirtualDesktop_SRCS test_plasma_virtual_desktop.cpp ) add_executable(testPlasmaVirtualDesktop ${testPlasmaVirtualDesktop_SRCS}) -target_link_libraries( testPlasmaVirtualDesktop Qt::Test Qt::Gui KF5::WaylandClient kwin) +target_link_libraries( testPlasmaVirtualDesktop Qt::Test Qt::Gui KF6::WaylandClient kwin) add_test(NAME kwayland-testPlasmaVirtualDesktop COMMAND testPlasmaVirtualDesktop) ecm_mark_as_test(testPlasmaVirtualDesktop) @@ -299,7 +299,7 @@ set( testPlasmaActivities_SRCS test_plasma_activities.cpp ) add_executable(testPlasmaActivities ${testPlasmaActivities_SRCS}) -target_link_libraries( testPlasmaActivities Qt::Test Qt::Gui KF5::WaylandClient kwin) +target_link_libraries( testPlasmaActivities Qt::Test Qt::Gui KF6::WaylandClient kwin) add_test(NAME kwayland-testPlasmaActivities COMMAND testPlasmaActivities) ecm_mark_as_test(testPlasmaActivities) @@ -311,7 +311,7 @@ set( testXdgOutput_SRCS ../../tests/fakeoutput.cpp ) add_executable(testXdgOutput ${testXdgOutput_SRCS}) -target_link_libraries( testXdgOutput Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client Wayland::Server) +target_link_libraries( testXdgOutput Qt::Test Qt::Gui KF6::WaylandClient kwin Wayland::Client Wayland::Server) add_test(NAME kwayland-testXdgOutput COMMAND testXdgOutput) ecm_mark_as_test(testXdgOutput) @@ -322,7 +322,7 @@ set( testXdgdecoration_SRCS test_xdg_decoration.cpp ) add_executable(testXdgDecoration ${testXdgdecoration_SRCS}) -target_link_libraries( testXdgDecoration Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client Wayland::Server) +target_link_libraries( testXdgDecoration Qt::Test Qt::Gui KF6::WaylandClient kwin Wayland::Client Wayland::Server) add_test(NAME kwayland-testXdgDecoration COMMAND testXdgDecoration) ecm_mark_as_test(testXdgDecoration) diff --git a/src/wayland/autotests/server/CMakeLists.txt b/src/wayland/autotests/server/CMakeLists.txt index 28e32d42c2..8ee75df271 100644 --- a/src/wayland/autotests/server/CMakeLists.txt +++ b/src/wayland/autotests/server/CMakeLists.txt @@ -42,7 +42,7 @@ else() ${WaylandProtocols_DATADIR}/unstable/tablet/tablet-unstable-v2.xml) endif() target_sources(testTabletInterface PRIVATE test_tablet_interface.cpp ${TABLET_SRCS}) -target_link_libraries( testTabletInterface Qt::Test kwin KF5::WaylandClient Wayland::Client) +target_link_libraries( testTabletInterface Qt::Test kwin KF6::WaylandClient Wayland::Client) add_test(NAME kwayland-testTabletInterface COMMAND testTabletInterface) ecm_mark_as_test(testTabletInterface) @@ -60,7 +60,7 @@ else() ${PROJECT_SOURCE_DIR}/src/wayland/protocols/wlr-data-control-unstable-v1.xml) endif() target_sources(testDataControlInterface PRIVATE test_datacontrol_interface.cpp ${DATACONTROL_SRCS}) -target_link_libraries( testDataControlInterface Qt::Test kwin KF5::WaylandClient Wayland::Client) +target_link_libraries( testDataControlInterface Qt::Test kwin KF6::WaylandClient Wayland::Client) add_test(NAME kwayland-testDataControlInterface COMMAND testDataControlInterface) ecm_mark_as_test(testDataControlInterface) @@ -78,7 +78,7 @@ else() ${WaylandProtocols_DATADIR}/unstable/keyboard-shortcuts-inhibit/keyboard-shortcuts-inhibit-unstable-v1.xml) endif() target_sources(testKeyboardShortcutsInhibitorInterface PRIVATE test_keyboard_shortcuts_inhibitor_interface.cpp ${KEYBOARD_SHORTCUTS_INHIBITOR_SRCS}) -target_link_libraries(testKeyboardShortcutsInhibitorInterface Qt::Test kwin KF5::WaylandClient Wayland::Client) +target_link_libraries(testKeyboardShortcutsInhibitorInterface Qt::Test kwin KF6::WaylandClient Wayland::Client) add_test(NAME kwayland-testKeyboardShortcutsInhibitorInterface COMMAND testKeyboardShortcutsInhibitorInterface) ecm_mark_as_test(testKeyboardShortcutsInhibitorInterface) @@ -96,7 +96,7 @@ else() ${WaylandProtocols_DATADIR}/stable/viewporter/viewporter.xml) endif() target_sources(testViewporterInterface PRIVATE test_viewporter_interface.cpp ${VIEWPORTER_SRCS}) -target_link_libraries(testViewporterInterface Qt::Test kwin KF5::WaylandClient Wayland::Client) +target_link_libraries(testViewporterInterface Qt::Test kwin KF6::WaylandClient Wayland::Client) add_test(NAME kwayland-testViewporterInterface COMMAND testViewporterInterface) ecm_mark_as_test(testViewporterInterface) @@ -114,7 +114,7 @@ else() ${PLASMA_WAYLAND_PROTOCOLS_DIR}/zkde-screencast-unstable-v1.xml) endif() target_sources(testScreencastV1Interface PRIVATE test_screencast.cpp ${SCREENCAST_SRCS}) -target_link_libraries(testScreencastV1Interface Qt::Test kwin Wayland::Client KF5::WaylandClient) +target_link_libraries(testScreencastV1Interface Qt::Test kwin Wayland::Client KF6::WaylandClient) add_test(NAME kwayland-testScreencastV1Interface COMMAND testScreencastV1Interface) ecm_mark_as_test(testScreencastV1Interface) @@ -135,7 +135,7 @@ else() ) endif() target_sources(testInputMethodInterface PRIVATE test_inputmethod_interface.cpp ../../tests/fakeoutput.cpp ${INPUTMETHOD_SRCS}) -target_link_libraries(testInputMethodInterface Qt::Test kwin KF5::WaylandClient Wayland::Client) +target_link_libraries(testInputMethodInterface Qt::Test kwin KF6::WaylandClient Wayland::Client) add_test(NAME kwayland-testInputMethodInterface COMMAND testInputMethodInterface) ecm_mark_as_test(testInputMethodInterface) @@ -159,7 +159,7 @@ else() ) endif() target_sources(testLayerShellV1Interface PRIVATE test_layershellv1_interface.cpp ${LAYERSHELLV1_SRCS}) -target_link_libraries(testLayerShellV1Interface Qt::Test kwin KF5::WaylandClient Wayland::Client) +target_link_libraries(testLayerShellV1Interface Qt::Test kwin KF6::WaylandClient Wayland::Client) add_test(NAME kwayland-testLayerShellV1Interface COMMAND testLayerShellV1Interface) ecm_mark_as_test(testLayerShellV1Interface) @@ -178,7 +178,7 @@ else() ${WaylandProtocols_DATADIR}/unstable/text-input/text-input-unstable-v3.xml) endif() target_sources(testTextInputV3Interface PRIVATE test_textinputv3_interface.cpp ${TEXTINPUTV3_SRCS}) -target_link_libraries(testTextInputV3Interface Qt::Test kwin KF5::WaylandClient Wayland::Client) +target_link_libraries(testTextInputV3Interface Qt::Test kwin KF6::WaylandClient Wayland::Client) add_test(NAME kwayland-testTextInputV3Interface COMMAND testTextInputV3Interface) ecm_mark_as_test(testTextInputV3Interface) @@ -196,6 +196,6 @@ else() ${WaylandProtocols_DATADIR}/unstable/text-input/text-input-unstable-v1.xml) endif() target_sources(testTextInputV1Interface PRIVATE test_textinputv1_interface.cpp ${TEXTINPUTV1_SRCS}) -target_link_libraries(testTextInputV1Interface Qt::Test kwin KF5::WaylandClient Wayland::Client) +target_link_libraries(testTextInputV1Interface Qt::Test kwin KF6::WaylandClient Wayland::Client) add_test(NAME kwayland-testTextInputV1Interface COMMAND testTextInputV1Interface) ecm_mark_as_test(testTextInputV1Interface) diff --git a/src/wayland/tests/CMakeLists.txt b/src/wayland/tests/CMakeLists.txt index 1ef001a648..5830801bae 100644 --- a/src/wayland/tests/CMakeLists.txt +++ b/src/wayland/tests/CMakeLists.txt @@ -1,7 +1,7 @@ include(ECMMarkAsTest) -# find_package(Qt5Core ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENT Private _check_private) -include_directories(SYSTEM ${Qt5Core_PRIVATE_INCLUDE_DIRS}) +# find_package(Qt6Core ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENT Private _check_private) +include_directories(SYSTEM ${Qt6Core_PRIVATE_INCLUDE_DIRS}) set(testServer_SRCS waylandservertest.cpp fakeoutput.cpp @@ -22,44 +22,44 @@ if (TARGET Qt::Widgets) endif() add_executable(copyClient copyclient.cpp) -target_link_libraries(copyClient KF5::WaylandClient) +target_link_libraries(copyClient KF6::WaylandClient) ecm_mark_as_test(copyClient) add_executable(pasteClient pasteclient.cpp) -target_link_libraries(pasteClient Qt::Concurrent KF5::WaylandClient) +target_link_libraries(pasteClient Qt::Concurrent KF6::WaylandClient) ecm_mark_as_test(pasteClient) add_executable(touchClientTest touchclienttest.cpp) -target_link_libraries(touchClientTest KF5::WaylandClient) +target_link_libraries(touchClientTest KF6::WaylandClient) add_executable(panelTest paneltest.cpp) -target_link_libraries(panelTest KF5::WaylandClient) +target_link_libraries(panelTest KF6::WaylandClient) ecm_mark_as_test(panelTest) add_executable(subsurface-test subsurfacetest.cpp) -target_link_libraries(subsurface-test Qt::Core Qt::Gui KF5::WaylandClient) +target_link_libraries(subsurface-test Qt::Core Qt::Gui KF6::WaylandClient) ecm_mark_as_test(subsurface-test) add_executable(shadowTest shadowtest.cpp) -target_link_libraries(shadowTest KF5::WaylandClient) +target_link_libraries(shadowTest KF6::WaylandClient) ecm_mark_as_test(shadowTest) if (TARGET Qt::Widgets) add_executable(dpmsTest dpmstest.cpp) - target_link_libraries(dpmsTest KF5::WaylandClient Qt::Widgets) + target_link_libraries(dpmsTest KF6::WaylandClient Qt::Widgets) ecm_mark_as_test(dpmsTest) endif() add_executable(plasmasurface-test plasmasurfacetest.cpp) -target_link_libraries(plasmasurface-test Qt::Gui KF5::WaylandClient) +target_link_libraries(plasmasurface-test Qt::Gui KF6::WaylandClient) ecm_mark_as_test(plasmasurface-test) add_executable(xdgforeign-test xdgforeigntest.cpp) -target_link_libraries(xdgforeign-test Qt::Gui KF5::WaylandClient) +target_link_libraries(xdgforeign-test Qt::Gui KF6::WaylandClient) ecm_mark_as_test(xdgforeign-test) add_executable(xdg-test xdgtest.cpp) -target_link_libraries(xdg-test Qt::Gui KF5::WaylandClient) +target_link_libraries(xdg-test Qt::Gui KF6::WaylandClient) ecm_mark_as_test(xdg-test) diff --git a/src/wayland/tools/CMakeLists.txt b/src/wayland/tools/CMakeLists.txt index 97757693eb..48b21a6d75 100644 --- a/src/wayland/tools/CMakeLists.txt +++ b/src/wayland/tools/CMakeLists.txt @@ -4,8 +4,8 @@ if (${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR}) cmake_minimum_required(VERSION 3.16) project(qtwaylandscanner_kde CXX) set(CMAKE_CXX_STANDARD 20) - find_package(Qt5 5.15.0 CONFIG REQUIRED Core) - find_package(ECM ${KF5_MIN_VERSION} NO_MODULE REQUIRED) + find_package(Qt6 5.15.0 CONFIG REQUIRED Core) + find_package(ECM ${KF6_MIN_VERSION} NO_MODULE REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) endif() @@ -14,15 +14,15 @@ if(CMAKE_CROSSCOMPILING AND QTWAYLANDSCANNER_KDE_EXECUTABLE) add_executable(qtwaylandscanner_kde IMPORTED GLOBAL) set_target_properties(qtwaylandscanner_kde PROPERTIES IMPORTED_LOCATION ${QTWAYLANDSCANNER_KDE_EXECUTABLE}) elseif(CMAKE_CROSSCOMPILING) - if (NOT KF5_HOST_TOOLING) - message(FATAL_ERROR "Please provide a prefix with a native Qt build and pass -DKF5_HOST_TOOLING=path") + if (NOT KF6_HOST_TOOLING) + message(FATAL_ERROR "Please provide a prefix with a native Qt build and pass -DKF6_HOST_TOOLING=path") endif() # search native tooling prefix set(NATIVE_PREFIX "" CACHE STRING "CMAKE_PREFIX_PATH for native Qt libraries") if (NOT NATIVE_PREFIX) - string(FIND ${KF5_HOST_TOOLING} /lib idx) - string(SUBSTRING ${KF5_HOST_TOOLING} 0 ${idx} NATIVE_PREFIX) + string(FIND ${KF6_HOST_TOOLING} /lib idx) + string(SUBSTRING ${KF6_HOST_TOOLING} 0 ${idx} NATIVE_PREFIX) endif() message(STATUS "Building qtwaylandscanner_kde against ${NATIVE_PREFIX}") diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 30cd2d126f..0e716663f2 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,17 +1,17 @@ if (QT_MAJOR_VERSION EQUAL "5") - find_package(Qt5 REQUIRED COMPONENTS WaylandClient) + find_package(Qt6 REQUIRED COMPONENTS WaylandClient) endif() if (XCB_ICCCM_FOUND) set(normalhintsbasesizetest_SRCS normalhintsbasesizetest.cpp) add_executable(normalhintsbasesizetest ${normalhintsbasesizetest_SRCS}) - target_link_libraries(normalhintsbasesizetest XCB::XCB XCB::ICCCM KF5::WindowSystem) + target_link_libraries(normalhintsbasesizetest XCB::XCB XCB::ICCCM KF6::WindowSystem) endif() # next target set(screenedgeshowtest_SRCS screenedgeshowtest.cpp) add_executable(screenedgeshowtest ${screenedgeshowtest_SRCS}) -target_link_libraries(screenedgeshowtest Qt::Widgets KF5::ConfigCore KF5::WindowSystem KF5::WaylandClient ${XCB_XCB_LIBRARY}) +target_link_libraries(screenedgeshowtest Qt::Widgets KF6::ConfigCore KF6::WindowSystem KF6::WaylandClient ${XCB_XCB_LIBRARY}) if (QT_MAJOR_VERSION EQUAL "5") target_link_libraries(screenedgeshowtest Qt::X11Extras) else() @@ -20,7 +20,7 @@ endif() target_include_directories(screenedgeshowtest PRIVATE ${CMAKE_SOURCE_DIR}/src) add_executable(x11shadowreader x11shadowreader.cpp) -target_link_libraries(x11shadowreader XCB::XCB Qt::Widgets KF5::ConfigCore KF5::WindowSystem) +target_link_libraries(x11shadowreader XCB::XCB Qt::Widgets KF6::ConfigCore KF6::WindowSystem) if (QT_MAJOR_VERSION EQUAL "5") target_link_libraries(x11shadowreader Qt::X11Extras) else() @@ -30,11 +30,11 @@ target_include_directories(x11shadowreader PRIVATE ${CMAKE_SOURCE_DIR}/src) add_executable(pointerconstraints pointerconstraintstest.cpp) add_definitions(-DDIR="${CMAKE_CURRENT_SOURCE_DIR}") -target_link_libraries(pointerconstraints XCB::XCB Qt::Gui Qt::Quick KF5::WaylandClient) +target_link_libraries(pointerconstraints XCB::XCB Qt::Gui Qt::Quick KF6::WaylandClient) add_executable(pointergestures pointergesturestest.cpp) add_definitions(-DDIR="${CMAKE_CURRENT_SOURCE_DIR}") -target_link_libraries(pointergestures Qt::Gui Qt::Quick KF5::WaylandClient) +target_link_libraries(pointergestures Qt::Gui Qt::Quick KF6::WaylandClient) add_executable(cursorhotspottest cursorhotspottest.cpp) target_link_libraries(cursorhotspottest Qt::Widgets) @@ -50,7 +50,7 @@ if (QT_MAJOR_VERSION EQUAL "5") ) add_executable(lockscreenoverlaytest lockscreenoverlaytest.cpp) - target_link_libraries(lockscreenoverlaytest Qt::Widgets Qt::WaylandClient Qt::WaylandClientPrivate Wayland::Client KF5::WindowSystem) + target_link_libraries(lockscreenoverlaytest Qt::Widgets Qt::WaylandClient Qt::WaylandClientPrivate Wayland::Client KF6::WindowSystem) ecm_add_qtwayland_client_protocol(lockscreenoverlaytest PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/kde-lockscreen-overlay-v1.xml BASENAME kde-lockscreen-overlay-v1