Hrvoje Senjan 2015-05-04 13:04:21 +00:00 committed by Git OBS Bridge
parent 075362656a
commit ebea39fb6e

View File

@ -12,10 +12,10 @@ index 664dc93..0a3f281 100644
diff --git a/src/lib/core/manager_p.cpp b/src/lib/core/manager_p.cpp diff --git a/src/lib/core/manager_p.cpp b/src/lib/core/manager_p.cpp
index 09003c1..984c910 100644 index 6c6130b..ac17bf0 100644
--- a/src/lib/core/manager_p.cpp --- a/src/lib/core/manager_p.cpp
+++ b/src/lib/core/manager_p.cpp +++ b/src/lib/core/manager_p.cpp
@@ -64,11 +64,11 @@ Manager *Manager::self() @@ -72,11 +72,11 @@ Manager *Manager::self()
->property("org.kde.KActivities.core.disableAutostart") ->property("org.kde.KActivities.core.disableAutostart")
.toBool()) { .toBool()) {
qCDebug(KAMD_CORELIB) << "Starting the activity manager daemon"; qCDebug(KAMD_CORELIB) << "Starting the activity manager daemon";
@ -30,10 +30,10 @@ index 09003c1..984c910 100644
} }
diff --git a/src/service/Application.cpp b/src/service/Application.cpp diff --git a/src/service/Application.cpp b/src/service/Application.cpp
index eef0eb4..6e2f7d7 100644 index ec74daa..83dbf86 100644
--- a/src/service/Application.cpp --- a/src/service/Application.cpp
+++ b/src/service/Application.cpp +++ b/src/service/Application.cpp
@@ -360,7 +360,7 @@ int main(int argc, char **argv) @@ -364,7 +364,7 @@ int main(int argc, char **argv)
// Starting the dameon // Starting the dameon
QProcess::startDetached( QProcess::startDetached(
@ -43,10 +43,10 @@ index eef0eb4..6e2f7d7 100644
); );
diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt
index 68ad30b..750a85d 100644 index 5c8ecc5..adf72b4 100644
--- a/src/service/CMakeLists.txt --- a/src/service/CMakeLists.txt
+++ b/src/service/CMakeLists.txt +++ b/src/service/CMakeLists.txt
@@ -63,9 +63,9 @@ qt5_add_dbus_adaptor ( @@ -64,9 +64,9 @@ qt5_add_dbus_adaptor (
Features.h Features Features.h Features
) )
@ -57,8 +57,8 @@ index 68ad30b..750a85d 100644
+target_link_libraries (kactivitymanagerd5 +target_link_libraries (kactivitymanagerd5
Qt5::Core Qt5::Core
Qt5::DBus Qt5::DBus
Qt5::Widgets Qt5::Gui
@@ -85,7 +85,7 @@ install (FILES @@ -86,7 +86,7 @@ install (FILES
) )
install (TARGETS install (TARGETS
@ -68,7 +68,7 @@ index 68ad30b..750a85d 100644
install (FILES install (FILES
diff --git a/src/service/files/kactivitymanagerd.desktop b/src/service/files/kactivitymanagerd.desktop diff --git a/src/service/files/kactivitymanagerd.desktop b/src/service/files/kactivitymanagerd.desktop
index b3d698f..a662bcf 100644 index 710f09d..c1a45e3 100644
--- a/src/service/files/kactivitymanagerd.desktop --- a/src/service/files/kactivitymanagerd.desktop
+++ b/src/service/files/kactivitymanagerd.desktop +++ b/src/service/files/kactivitymanagerd.desktop
@@ -4,7 +4,7 @@ Icon=preferences-activities @@ -4,7 +4,7 @@ Icon=preferences-activities