Commit graph

9 commits

Author SHA1 Message Date
Aleix Pol
5e0a7a34b9 Merge branch 'master' into ssl
# Conflicts:
#	cli/kdeconnect-cli.cpp
#	core/backends/lan/landevicelink.cpp
#	core/backends/lan/landevicelink.h
#	core/backends/lan/lanlinkprovider.cpp
#	core/backends/lan/lanlinkprovider.h
#	core/backends/lan/socketlinereader.h
#	core/backends/lan/uploadjob.cpp
#	core/backends/lan/uploadjob.h
#	core/backends/loopback/loopbackdevicelink.h
#	core/daemon.cpp
#	core/daemon.h
#	core/device.cpp
#	core/device.h
2015-09-11 17:25:23 +02:00
Aleix Pol
d58f6314fe run Clang Modernize
Minus the auto change
2015-09-08 10:47:37 +02:00
Vineet Garg
e6da860fb7 Fixed issues pointed out on CR 2015-07-14 17:34:04 +05:30
Vineet Garg
148a713176 Initial working implementation of ssl 2015-07-05 18:53:53 +05:30
Heiko Becker
d17c4419bd testsocketlinereader: USE QTEST_GUILESS_MAIN
This patch allows running the tests without a display server.

REVIEW: 122991
2015-03-17 18:37:59 +01:00
David Suárez
c935ea8334 TestSocketLineReader: Ensure we provide a more appropiate message if we fail trying to open a connection to the client
A litle irrelevant change :)

BTW, I'm encounter this test error on Debian kfreebsd i386:
  https://buildd.debian.org/status/fetch.php?pkg=kdeconnect&arch=kfreebsd-i386&ver=0.7-1&stamp=1404242653

Maybe someone have a clue on what is happening here :)

REVIEW: 119091
2014-07-07 12:45:13 +02:00
Aleix Pol
b88897847b Reorganize sources
We broke kded into core and kded, core contains the library with the backends
and plugins.
Also we renamed libkdeconnect to interfaces.
2014-06-14 15:22:40 +02:00
David Suárez
d6824ad8f8 Fixed unit test!
REVIEW: 117387
2014-04-12 23:07:40 +02:00
Albert Vaca
d7e9a42a7b Moved unit tests together 2014-04-12 23:04:35 +02:00
Renamed from kded/autotests/testsocketlinereader.cpp (Browse further)