Fix building with activities after the kactivities -> plasma-activities rename

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b47591da480785bf95ecbbff07b686d38440ad11..fbc0bd38a85a615fc9e93e51e4c4efa2fd15db5e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,8 +90,8 @@ endif()
 find_package(KF6 ${KF6_MIN_VERSION} OPTIONAL_COMPONENTS
     DocTools
 )
 find_package(KF6 ${KF6_MIN_VERSION} OPTIONAL_COMPONENTS
     DocTools
 )

-find_package(KF6Activities)
-set_package_properties(KF6Activities PROPERTIES DESCRIPTION "KActivities libraries"
+find_package(PlasmaActivities)
+set_package_properties(PlasmaActivities PROPERTIES DESCRIPTION "PlasmaActivities libraries"

                        URL "https://www.kde.org"
                        TYPE OPTIONAL
                        PURPOSE "For tracking which folders are frequently accessed on a Plasma desktop"
                        URL "https://www.kde.org"
                        TYPE OPTIONAL
                        PURPOSE "For tracking which folders are frequently accessed on a Plasma desktop"


@@ -129,8 +129,8 @@ set_package_properties(KF6FileMetaData PROPERTIES
                        PURPOSE "For accessing file metadata labels"
                       )
 
                        PURPOSE "For accessing file metadata labels"
                       )
 

-if (KF6Activities_FOUND)
-    set(HAVE_KACTIVITIES TRUE)
+if (PlasmaActivities_FOUND)
+    set(HAVE_PLASMA_ACTIVITIES TRUE)

 endif()
 
 if (KF6Baloo_FOUND AND KF6BalooWidgets_FOUND AND KF6FileMetaData_FOUND)
 endif()
 
 if (KF6Baloo_FOUND AND KF6BalooWidgets_FOUND AND KF6FileMetaData_FOUND)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index be83cd2d0a56b420d556b0f6cabea52d144040bb..533b5d221271c3cc24974a985fe563465d7293d9 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -437,10 +437,10 @@ target_link_libraries(dolphinstatic
     Phonon::phonon4qt6
 )
 
     Phonon::phonon4qt6
 )
 

-if (HAVE_KACTIVITIES)
+if (HAVE_PLASMA_ACTIVITIES)

     target_link_libraries(
         dolphinstatic
     target_link_libraries(
         dolphinstatic

-        KF6::Activities
+        Plasma::Activities

     )
 endif()
 
     )
 endif()
 

diff --git a/src/config-dolphin.h.cmake b/src/config-dolphin.h.cmake
index af78c8622c6beef1a49643ade7006e44e3adcfa4..797ea38c5996425f2dee20d8937c3c1a17d6aaa2 100644 (file)
--- a/src/config-dolphin.h.cmake
+++ b/src/config-dolphin.h.cmake
@@ -1,5 +1,5 @@
 #cmakedefine01 HAVE_BALOO
 #cmakedefine01 HAVE_BALOO

-#cmakedefine01 HAVE_KACTIVITIES
+#cmakedefine01 HAVE_PLASMA_ACTIVITIES

 #cmakedefine01 HAVE_KUSERFEEDBACK
 #cmakedefine01 HAVE_PACKAGEKIT
 #cmakedefine01 HAVE_TERMINAL
 #cmakedefine01 HAVE_KUSERFEEDBACK
 #cmakedefine01 HAVE_PACKAGEKIT
 #cmakedefine01 HAVE_TERMINAL

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index f5cb459fbcbbda0064679efe77684b815b2267d0..a4db8b74a9ed21148263f34956c78003bac7689f 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -20,8 +20,8 @@
 #include "statusbar/dolphinstatusbar.h"
 
 #include <KActionCollection>
 #include "statusbar/dolphinstatusbar.h"
 
 #include <KActionCollection>

-#if HAVE_KACTIVITIES
-#include <KActivities/ResourceInstance>
+#if HAVE_PLASMA_ACTIVITIES
+#include <PlasmaActivities/ResourceInstance>

 #endif
 #include <KApplicationTrader>
 #include <KFileItemActions>
 #endif
 #include <KApplicationTrader>
 #include <KFileItemActions>


@@ -574,7 +574,7 @@ void DolphinViewContainer::setUrl(const QUrl &newUrl)
         m_urlNavigator->setLocationUrl(newUrl);
     }
 
         m_urlNavigator->setLocationUrl(newUrl);
     }
 

-#if HAVE_KACTIVITIES
+#if HAVE_PLASMA_ACTIVITIES

     KActivities::ResourceInstance::notifyAccessed(newUrl);
 #endif
 }
     KActivities::ResourceInstance::notifyAccessed(newUrl);
 #endif
 }