From: Heiko Becker Date: Tue, 9 May 2023 06:59:14 +0000 (+0200) Subject: Fix build without KF5Activities X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/c3fb0dc15ba71da45ed854769a3d80410c8fc598?ds=inline Fix build without KF5Activities --- diff --git a/src/global.cpp b/src/global.cpp index 8babbbddc..9246eeb33 100644 --- a/src/global.cpp +++ b/src/global.cpp @@ -16,7 +16,7 @@ #include #include #include -#ifdef HAVE_KACTIVITIES +#if HAVE_KACTIVITIES #include #endif @@ -143,7 +143,7 @@ bool Dolphin::attachToExistingInstance(const QList &inputUrls, QVector, 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, QStringList>> Do QSharedPointer 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()))