diff --git a/autotests/core/Process.cpp b/autotests/core/Process.cpp index 664dc93..0a3f281 100644 --- a/autotests/core/Process.cpp +++ b/autotests/core/Process.cpp @@ -85,7 +85,7 @@ void Modifier::initTestCase() // qDebug() << env; s_process->setEnvironment(env); - s_process->start(QStringLiteral(KAMD_INSTALL_PREFIX "/bin/kactivitymanagerd")); + s_process->start(QStringLiteral(KAMD_INSTALL_PREFIX "/bin/kactivitymanagerd5")); s_process->waitForStarted(); diff --git a/src/lib/core/manager_p.cpp b/src/lib/core/manager_p.cpp index 6c6130b..ac17bf0 100644 --- a/src/lib/core/manager_p.cpp +++ b/src/lib/core/manager_p.cpp @@ -72,11 +72,11 @@ Manager *Manager::self() ->property("org.kde.KActivities.core.disableAutostart") .toBool()) { qCDebug(KAMD_CORELIB) << "Starting the activity manager daemon"; - QProcess::startDetached(QStringLiteral("kactivitymanagerd")); + QProcess::startDetached(QStringLiteral("kactivitymanagerd5")); } #else - QProcess::startDetached(QStringLiteral("kactivitymanagerd")); + QProcess::startDetached(QStringLiteral("kactivitymanagerd5")); #endif } diff --git a/src/service/Application.cpp b/src/service/Application.cpp index ec74daa..83dbf86 100644 --- a/src/service/Application.cpp +++ b/src/service/Application.cpp @@ -364,7 +364,7 @@ int main(int argc, char **argv) // Starting the dameon QProcess::startDetached( - KAMD_INSTALL_PREFIX "/bin/kactivitymanagerd", + KAMD_INSTALL_PREFIX "/bin/kactivitymanagerd5", QStringList{"start-daemon"} ); diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt index 5c8ecc5..adf72b4 100644 --- a/src/service/CMakeLists.txt +++ b/src/service/CMakeLists.txt @@ -64,9 +64,9 @@ qt5_add_dbus_adaptor ( Features.h Features ) -add_executable (kactivitymanagerd ${kactivitymanager_SRCS}) +add_executable (kactivitymanagerd5 ${kactivitymanager_SRCS}) -target_link_libraries (kactivitymanagerd +target_link_libraries (kactivitymanagerd5 Qt5::Core Qt5::DBus Qt5::Gui @@ -86,7 +86,7 @@ install (FILES ) install (TARGETS - kactivitymanagerd ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} + kactivitymanagerd5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} ) install (FILES diff --git a/src/service/files/kactivitymanagerd.desktop b/src/service/files/kactivitymanagerd.desktop index 710f09d..c1a45e3 100644 --- a/src/service/files/kactivitymanagerd.desktop +++ b/src/service/files/kactivitymanagerd.desktop @@ -4,7 +4,7 @@ Icon=preferences-activities X-KDE-ServiceTypes= X-DBUS-StartupType=Unique X-KDE-StartupNotify=false -Exec=kactivitymanagerd +Exec=kactivitymanagerd5 Name=Activity Manager Name[ar]=مدير الأنشطة