tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
691 commits 81 branches 117 tags 12 MiB
Commit graph

23 commits

Author SHA1 Message Date
Albert Vaca
c013966f4b Version number is now set in a single place 2015-02-04 23:52:07 -08: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
Albert Vaca
2b13d0825c Merge branch 'master' into frameworks 
Conflicts:
	kded/CMakeLists.txt
 2014-11-22 09:29:05 -08:00
Albert Vaca
d8943f03ae Added dbus activation to org.kde.kdeconnect 2014-11-22 09:26:15 -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
Albert Vaca
ddb9190fbe More robust fix to problem with device ids being non exportable on dbus 2014-10-10 11:26:50 -07: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
9ed5004997 Link publickly against KF5::KIOCore 
This is neede since kdeconnectcore public api contains KIO/FIleJob
 2014-09-22 10:17:32 +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
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
Sebastian Kügler
506bd2a890 add qjson includes at top-level 
It's needed by plugins as well, not just by the core.

Reviewed-by: Aleix
 2014-09-07 14:12:00 +02:00
Christophe Giboudeaux
b7eb49d996 -Wmissing-include-dirs 2014-08-27 15:10:59 +02:00
Aleix Pol
a8fb015a22 Fix compilation after merge 2014-07-02 01:39:38 +02:00
Albert Vaca
a303b73238 Merge branch 'master' into frameworks 
Conflicts:
	cli/kdeconnect-cli.cpp
	core/CMakeLists.txt
	plasmoid/package/contents/ui/FullRepresentation.qml
	plugins/ping/pingplugin.cpp
 2014-07-01 23:59:38 +02:00
Albert Vaca
cabb0f2f7b Simplified debug areas so we only have one, called "kdeconnect" 2014-07-01 01:26:08 +02:00
David Suárez
dcfb37c85b Provide versioned so files for kdeconnectcore lib 
REVIEW: 119013
 2014-06-30 01:12:49 +02:00
Christophe Giboudeaux
5a91db4427 Use the compat link_public/link_private keywords instead. 
Just removing the public/private keywords uncovers some other build errors.
 2014-06-24 23:27:46 +02:00
Christophe Giboudeaux
ec9317e7ef Fix build with older CMake versions. 2014-06-24 22:40:23 +02:00
Aleix Pol
349a42cf16 Port libraries to translation domains 2014-06-18 02:49:07 +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
96d6e4bccb install kdeconnectcore 2014-06-14 18:04:54 +02:00
Aleix Pol
741abafaf7 Move the plugins into a different top-ĺevel directory 
Reviewed by Albert Vaca
 2014-06-14 16:34:11 +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