Commit graph

78 commits

Author SHA1 Message Date
Aleix Pol
3caf5e7908 Move some find_package dependencies to the children directories as agreed 2015-04-10 17:48:48 +02:00
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
Albert Vaca
a3decd542c Includes cleanup 2015-03-13 21:20:58 -07:00
Heiko Becker
260301155f Use co-installable qca-qt5 version
If both qt4 and qt5 versions of qca are present the build of the
frameworks branch tries to find Qt4 pulled in by qca and thus fails.

REVIEW: 122054
2015-01-15 21:35:30 -08:00
Aleix Pol
21ab5a4f81 Merge branch 'master' into frameworks
Mostly kDebug -> qCDebug
Also some KCmdLineArgs -> QCommandLineParser

Conflicts:
	cli/kdeconnect-cli.cpp
	core/CMakeLists.txt
	core/backends/lan/lanlinkprovider.cpp
	core/daemon.cpp
	core/pluginloader.cpp
	interfaces/CMakeLists.txt
	kio/kiokdeconnect.cpp
	plugins/mousepad/CMakeLists.txt
	plugins/mousepad/mousepadplugin.h
	plugins/mpriscontrol/mpriscontrolplugin.cpp
	plugins/sftp/sftpplugin.cpp
2014-11-04 19:12:29 +01:00
Aleix Pol
1a1969f42f Port to new QCA cmake structure, now it's called Qca
and the target name is qca
2014-09-23 20:05:22 +02:00
Àlex Fiestas
ced3fb5060 QDate.setYMD is deprecated, use setDate instead 2014-09-23 19:44:31 +02:00
Àlex Fiestas
dbea3171bd Make kdeconnect core compile without KDELibs4Support
This meant to add a lot of dependencies to each plugin since we had
KDELibs4support as PUBLIC link meaning that anything linking against
kdeconnectcore was linking at the same time to mostly all frameworks.

Now each plugin has more or less its dependencies in the CMake some
still depend on KDELibs4Support.

For the mousepad plugin I needed to add a fixX11.h file that basically
undefines/defines again some stuff xlib has that conflcits with normal
C++ and Qt.

Before it was not conflicting because some lib within KDELibs4Support
was including this file, but now we have to do it ourselves.
2014-09-22 02:40:51 +02:00
Àlex Fiestas
21712668ee Pass arguments in correct order to QCOMPARE
It is actual, expected .
2014-09-13 00:50:46 +02:00
Àlex Fiestas
f20f489999 Port to aelperay from QJson to native json support
Straight forward port from QJson to the native Json support.

As a note I have added 2 helper functions that make the code bit more
readable (object2qvariant and qvariatn2qobject).
2014-09-13 00:49:56 +02:00
Àlex Fiestas
d3aec4887f Add content to the body that will be serialized
Just to make extra sure that the serializer works correctly.
2014-09-13 00:16:26 +02:00
Àlex Fiestas
a0ff36625d Make sure we have initialized QCA before using it
QCA::isSupported uses a private global object that is 0 if
QCA::Initializer is not instanciated.
2014-09-12 23:32:19 +02:00
Sune Vuorela
e3237881aa Catch a misconfigured QCA a bit earlier.
REVIEW:120095
2014-09-09 09:19:07 +02: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
bf272ea3e7 Remove usage of KDE4_ variables 2014-06-18 02:39:30 +02:00
Aleix Pol
a1a560c469 First approach to a KF5 port of KDE Connect
Ported using KDELibs4Support, for a smaller delta, so we can keep
developing on master until we decide not to.

At the moment, it builds and installs but tests don't pass because
of a QCA2 initialization problem I didn't manage to debug yet.

CCMAIL: kdeconnect@kde.org
2014-06-16 20:02:07 +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
Aleix Pol
5c9d3a9d42 Make a new kdeconnectcore library
Solves the need of compiling device.cpp against all plugins. Also
networkpackage and others don't need to either.

REVIEW: 118742
2014-06-14 14:31:31 +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
Aleix Pol
e3b4b3660f Compile everything
Albert, this is asking you to be a library ;)

CCMAIL: albertvaka@gmail.com
2013-11-08 03:13:13 +01:00
Albert Vaca
cf869dfd57 CMake now enforces QJson version 8.1 or greater 2013-10-29 17:46:57 +01:00
Albert Vaca
1d4482b5c1 Oops, last commits broke tests
Missing files to link
2013-10-01 14:09:17 +02:00
Albert Vaca
39550ff6ea Type was missing for identity packages
Added a test for it
2013-09-03 02:14:55 +02:00
Albert Vaca
892385f3fc Simplified NetworkPackage format
Now protocol version is only sent once (in the identity package)
Removed "isEncrypted" bit, using type "kdeconnect.encrypted" instead.
NetworkPackage's decrypt and unserialize return false when find problems
Updated tests.
2013-09-02 13:26:26 +02:00
Albert Vaca
36e5d41811 Renamed daemon -> kded 2013-09-02 03:23:34 +02:00
Albert Vaca
f59ab45644 Support encrypting strings longer than key.maximumEncryptSize()
Strings are divided in smaller chunks and serialized in an array
Added a test for this case
2013-09-02 03:17:23 +02:00
Albert Vaca
deeeb595b3 Implemented encryption in NetworkPackage using QCA2
Fixed some bugs in the pairing process state machine
Keys are now stored in base64 in KConfig (was storing non-allowed chars)
Updated NetworkPackage tests to include encryption
Increased networkpackage version 1 -> 2
2013-09-01 22:13:03 +02:00