kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-04 17:30:55 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Antonio Rojas 2023-11-30 08:59:04 +01:00
parent 697d1648b7
commit 9c313813f5
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -90,8 +90,8 @@ endif()
find_package(KF6 ${KF6_MIN_VERSION} OPTIONAL_COMPONENTS find_package(KF6 ${KF6_MIN_VERSION} OPTIONAL_COMPONENTS
DocTools DocTools
) )
find_package(KF6Activities) find_package(PlasmaActivities)
set_package_properties(KF6Activities PROPERTIES DESCRIPTION "KActivities libraries" set_package_properties(PlasmaActivities PROPERTIES DESCRIPTION "PlasmaActivities libraries"
URL "https://www.kde.org" URL "https://www.kde.org"
TYPE OPTIONAL TYPE OPTIONAL
PURPOSE "For tracking which folders are frequently accessed on a Plasma desktop" 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) if (PlasmaActivities_FOUND)
set(HAVE_KACTIVITIES TRUE) set(HAVE_PLASMA_ACTIVITIES TRUE)
endif() endif()
if (KF6Baloo_FOUND AND KF6BalooWidgets_FOUND AND KF6FileMetaData_FOUND) if (KF6Baloo_FOUND AND KF6BalooWidgets_FOUND AND KF6FileMetaData_FOUND)

4
src/CMakeLists.txt
View File

@ -437,10 +437,10 @@ target_link_libraries(dolphinstatic
Phonon::phonon4qt6 Phonon::phonon4qt6
) )
if (HAVE_KACTIVITIES) if (HAVE_PLASMA_ACTIVITIES)
target_link_libraries( target_link_libraries(
dolphinstatic dolphinstatic
KF6::Activities Plasma::Activities
) )
endif() endif()

2
src/config-dolphin.h.cmake
View File

@ -1,5 +1,5 @@
#cmakedefine01 HAVE_BALOO #cmakedefine01 HAVE_BALOO
#cmakedefine01 HAVE_KACTIVITIES #cmakedefine01 HAVE_PLASMA_ACTIVITIES
#cmakedefine01 HAVE_KUSERFEEDBACK #cmakedefine01 HAVE_KUSERFEEDBACK
#cmakedefine01 HAVE_PACKAGEKIT #cmakedefine01 HAVE_PACKAGEKIT
#cmakedefine01 HAVE_TERMINAL #cmakedefine01 HAVE_TERMINAL

6
src/dolphinviewcontainer.cpp
View File

@ -20,8 +20,8 @@
#include "statusbar/dolphinstatusbar.h" #include "statusbar/dolphinstatusbar.h"
#include <KActionCollection> #include <KActionCollection>
#if HAVE_KACTIVITIES #if HAVE_PLASMA_ACTIVITIES
#include <KActivities/ResourceInstance> #include <PlasmaActivities/ResourceInstance>
#endif #endif
#include <KApplicationTrader> #include <KApplicationTrader>
#include <KFileItemActions> #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); KActivities::ResourceInstance::notifyAccessed(newUrl);
#endif #endif
} }