[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=2e9ff61

The following commit has been merged in the master branch:
commit 2e9ff61fcd23a69fe53a67fc3dda253e4c8fb4a0
Author: Àlex Fiestas <afiestas at kde.org>
Date:   Mon Sep 22 10:08:19 2014 +0200

    Make kded compile without KDELibs4Support
---
 kded/CMakeLists.txt | 2 +-
 kded/kded.cpp       | 5 ++---
 kded/kded.h         | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt
index 92952f7..3524dd6 100644
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
@@ -8,7 +8,7 @@ target_link_libraries(kdeconnectd kdeconnectcore KF5::DBusAddons KF5::ConfigWidg
 
 add_library(kded_kdeconnect MODULE kded.cpp)
 
-target_link_libraries(kded_kdeconnect KF5::DBusAddons KF5::KDELibs4Support)
+target_link_libraries(kded_kdeconnect KF5::Service KF5::DBusAddons)
 
 install(TARGETS kdeconnectd DESTINATION ${LIBEXEC_INSTALL_DIR})
 install(TARGETS kded_kdeconnect DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/kded/kded.cpp b/kded/kded.cpp
index 18276d8..0986974 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -53,15 +53,14 @@ void Kded::start()
 
     const QString daemon = QStringLiteral(KDECONNECTD_BIN);
     qDebug(KDECONNECT_KDED) << "Starting daemon " << daemon;
-    m_daemon = new KProcess(this);
+    m_daemon = new QProcess(this);
     connect(m_daemon, SIGNAL(started()), SLOT(daemonStarted()));
     connect(m_daemon, SIGNAL(error(QProcess::ProcessError)), this, SLOT(onError(QProcess::ProcessError)));
     connect(m_daemon, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(onFinished(int,QProcess::ExitStatus)));
     connect(m_daemon, SIGNAL(finished(int,QProcess::ExitStatus)), m_daemon, SLOT(deleteLater()));
 
     m_daemon->setProgram(daemon);
-    m_daemon->setOutputChannelMode(KProcess::SeparateChannels);
-    m_daemon->closeReadChannel(KProcess::StandardOutput);
+    m_daemon->closeReadChannel(QProcess::StandardOutput);
     m_daemon->start();
 }
 
diff --git a/kded/kded.h b/kded/kded.h
index acf05bd..5d2fe3b 100644
--- a/kded/kded.h
+++ b/kded/kded.h
@@ -22,7 +22,7 @@
 #define KDECONNECT_KDED_H
 
 #include <KDEDModule>
-#include <KProcess>
+#include <QProcess>
 
 #include <QLoggingCategory>
 
@@ -53,7 +53,7 @@ private Q_SLOTS:
     void checkIfDaemonTerminated();
 
 private:
-    KProcess* m_daemon;
+    QProcess* m_daemon;
 };
 
 Q_DECLARE_LOGGING_CATEGORY(KDECONNECT_KDED)

-- 
kdeconnect packaging