diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Activities Config ConfigWidgets CoreAddons I18n KIO KCMUtils Plasma Runner Service UnitConversion KDELibs4Support NewStuff Kross) -find_package(LibLegacyTaskManager CONFIG REQUIRED) +find_package(LibTaskManager CONFIG REQUIRED) find_package(X11) set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" diff --git a/applets/activitypager/CMakeLists.txt b/applets/activitypager/CMakeLists.txt --- a/applets/activitypager/CMakeLists.txt +++ b/applets/activitypager/CMakeLists.txt @@ -18,11 +18,10 @@ Qt5::Qml Qt5::Quick Qt5::DBus - PW::LibLegacyTaskManager ) if (X11_FOUND) - target_link_libraries(activitypagerplugin Qt5::X11Extras) + target_link_libraries(activitypagerplugin Qt5::X11Extras PW::LibTaskManager) endif() install(TARGETS activitypagerplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/activitypager) diff --git a/applets/activitypager/plugin/activitypager.cpp b/applets/activitypager/plugin/activitypager.cpp --- a/applets/activitypager/plugin/activitypager.cpp +++ b/applets/activitypager/plugin/activitypager.cpp @@ -42,16 +42,15 @@ #if HAVE_X11 #include +#include #endif #include #include #include #include -#include - const int FAST_UPDATE_DELAY = 100; const int UPDATE_DELAY = 500; const int MAXDESKTOPS = 20; @@ -596,13 +595,17 @@ return; } - bool ok; - const QList &ids = LegacyTaskManager::Task::idsFromMimeData(mimeData, &ok); - if (ok) { - foreach (const WId &id, ids) { - KWindowSystem::setOnActivities(id, {newActivity}); +#if HAVE_X11 + if (m_isX11) { + bool ok; + const QList &ids = TaskManager::XWindowTasksModel::winIdsFromMimeData(mimeData, &ok); + if (ok) { + foreach (const WId &id, ids) { + KWindowSystem::setOnActivities(id, {newActivity}); + } } } +#endif }