Hrvoje Senjan 2014-09-09 14:08:58 +00:00 committed by Git OBS Bridge
parent 0532f27e04
commit 957259fd07

View File

@ -12,7 +12,7 @@ index a7a0507..afa4bf1 100644
diff --git a/src/lib/core/manager_p.cpp b/src/lib/core/manager_p.cpp
index 2a81ff8..fc653a4 100644
index 077c634..7be66dd 100644
--- a/src/lib/core/manager_p.cpp
+++ b/src/lib/core/manager_p.cpp
@@ -94,11 +94,11 @@ Manager *Manager::self()
@ -30,23 +30,32 @@ index 2a81ff8..fc653a4 100644
}
diff --git a/src/service/Application.cpp b/src/service/Application.cpp
index 09332f8..572fe48 100644
index 6b0e3e1..3894540 100644
--- a/src/service/Application.cpp
+++ b/src/service/Application.cpp
@@ -351,7 +351,7 @@ int main(int argc, char **argv)
@@ -280,7 +280,7 @@ int main(int argc, char **argv)
application.setApplicationName(QStringLiteral("ActivityManager"));
application.setOrganizationDomain(QStringLiteral("kde.org"));
- // KAboutData about("kactivitymanagerd", Q_NULLPTR, ki18n("KDE Activity Manager"), "3.0",
+ // KAboutData about("kactivitymanagerd5", Q_NULLPTR, ki18n("KDE Activity Manager"), "3.0",
// ki18n("KDE Activity Management Service"),
// KAboutData::License_GPL,
// ki18n("(c) 2010, 2011, 2012 Ivan Cukic"), KLocalizedString(),
@@ -333,7 +333,7 @@ int main(int argc, char **argv)
// Starting the dameon
QProcess::startDetached(
- KAMD_INSTALL_PREFIX "/bin/kactivitymanagerd",
+ KAMD_INSTALL_PREFIX "/bin/kactivitymanagerd5",
{"start-daemon"}
QStringList{"start-daemon"}
);
diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt
index 38e6e2b..fb762e5 100644
index 4b4978b..2220f34 100644
--- a/src/service/CMakeLists.txt
+++ b/src/service/CMakeLists.txt
@@ -60,9 +60,9 @@ qt5_add_dbus_adaptor (
@@ -62,9 +62,9 @@ qt5_add_dbus_adaptor (
Features.h Features
)
@ -58,7 +67,7 @@ index 38e6e2b..fb762e5 100644
Qt5::Core
Qt5::DBus
Qt5::Widgets
@@ -82,7 +82,7 @@ install (FILES
@@ -84,7 +84,7 @@ install (FILES
)
install (TARGETS