1
0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-02 16:31:23 +00:00

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

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

View File

@ -90,8 +90,8 @@ endif()
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"
@ -129,8 +129,8 @@ set_package_properties(KF6FileMetaData PROPERTIES
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)

View File

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

View File

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

View File

@ -20,8 +20,8 @@
#include "statusbar/dolphinstatusbar.h"
#include <KActionCollection>
#if HAVE_KACTIVITIES
#include <KActivities/ResourceInstance>
#if HAVE_PLASMA_ACTIVITIES
#include <PlasmaActivities/ResourceInstance>
#endif
#include <KApplicationTrader>
#include <KFileItemActions>
@ -574,7 +574,7 @@ void DolphinViewContainer::setUrl(const QUrl &newUrl)
m_urlNavigator->setLocationUrl(newUrl);
}
#if HAVE_KACTIVITIES
#if HAVE_PLASMA_ACTIVITIES
KActivities::ResourceInstance::notifyAccessed(newUrl);
#endif
}