kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-12 12:54:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build without KF5Activities

Browse source
This commit is contained in:
Heiko Becker 2023-05-09 08:59:14 +02:00 committed by Méven Car
parent b82789f519
commit c3fb0dc15b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/global.cpp
View file

@ -16,7 +16,7 @@
#include <KIO/ApplicationLauncherJob>
#include <KService>
#include <KWindowSystem>
#ifdef HAVE_KACTIVITIES
#if HAVE_KACTIVITIES
#include <KActivities/Consumer>
#endif
@ -143,7 +143,7 @@ bool Dolphin::attachToExistingInstance(const QList<QUrl> &inputUrls,
QVector<QPair<QSharedPointer<OrgKdeDolphinMainWindowInterface>, QStringList>> Dolphin::dolphinGuiInstances(const QString &preferredService)
{
#ifdef HAVE_KACTIVITIES
#if HAVE_KACTIVITIES
static std::once_flag one_consumer;
static KActivities::Consumer *consumer;
std::call_once(one_consumer, []() {
@ -161,7 +161,7 @@ QVector<QPair<QSharedPointer<OrgKdeDolphinMainWindowInterface>, QStringList>> Do
QSharedPointer<OrgKdeDolphinMainWindowInterface> interface(
new OrgKdeDolphinMainWindowInterface(service, QStringLiteral("/dolphin/Dolphin_1"), QDBusConnection::sessionBus()));
if (interface->isValid() && !interface->lastError().isValid()) {
#ifdef HAVE_KACTIVITIES
#if HAVE_KACTIVITIES
const auto currentActivity = consumer->currentActivity();
if (currentActivity.isEmpty() || currentActivity == QStringLiteral("00000000-0000-0000-0000-000000000000")
|| interface->isOnActivity(consumer->currentActivity()))