[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=cc0fdac

The following commit has been merged in the master branch:
commit cc0fdacbf567f436fd46987631a239ebf9b4f125
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Mon Jun 20 02:31:55 2016 +0200

    Fixed compilation on Windows
---
 core/kdeconnectconfig.h        | 2 +-
 daemon/kdeconnectd.cpp         | 7 -------
 tests/downloadjobtest.cpp      | 1 -
 tests/testsocketlinereader.cpp | 1 -
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/core/kdeconnectconfig.h b/core/kdeconnectconfig.h
index e714dd2..9a6e7f5 100644
--- a/core/kdeconnectconfig.h
+++ b/core/kdeconnectconfig.h
@@ -81,8 +81,8 @@ private:
     KdeConnectConfig();
 
 private:
-    QScopedPointer<struct KdeConnectConfigPrivate> d;
 
+    struct KdeConnectConfigPrivate* d;
 };
 
 #endif
diff --git a/daemon/kdeconnectd.cpp b/daemon/kdeconnectd.cpp
index 556fd9e..bec04d6 100644
--- a/daemon/kdeconnectd.cpp
+++ b/daemon/kdeconnectd.cpp
@@ -18,9 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <unistd.h>
-#include <signal.h>
-
 #include <QApplication>
 #include <QNetworkAccessManager>
 
@@ -84,10 +81,6 @@ int main(int argc, char* argv[])
 
     KDBusService dbusService(KDBusService::Unique);
 
-#ifdef Q_OS_WIN
-    qputenv("KDE_FORK_SLAVES");
-#endif
-
     Daemon* daemon = new DesktopDaemon;
     QObject::connect(daemon, SIGNAL(destroyed(QObject*)), &app, SLOT(quit()));
 
diff --git a/tests/downloadjobtest.cpp b/tests/downloadjobtest.cpp
index efaea3d..312769b 100644
--- a/tests/downloadjobtest.cpp
+++ b/tests/downloadjobtest.cpp
@@ -26,7 +26,6 @@
 #include <QTimer>
 #include <QHostAddress>
 #include <KJob>
-#include <unistd.h>
 #include <iostream>
 
 class DownloadJobTest : public QObject
diff --git a/tests/testsocketlinereader.cpp b/tests/testsocketlinereader.cpp
index a3e73af..25c5f41 100644
--- a/tests/testsocketlinereader.cpp
+++ b/tests/testsocketlinereader.cpp
@@ -24,7 +24,6 @@
 #include <QProcess>
 #include <QEventLoop>
 #include <QTimer>
-#include <unistd.h>
 
 class TestSocketLineReader : public QObject
 {

-- 
kdeconnect packaging