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
Aleix Pol
665ba7481e
No need to have the FindQCA2
...
It's already provided by QCA itself
2014-09-23 19:24:34 +02:00
Christophe Giboudeaux
5bf93af31e
Add FindLibFakeKey.cmake.
...
The build system cannot guess that a new build dependency was added.
2014-08-27 15:35:21 +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
Ahmed Ibrahim Khalil
d14b4411cd
Implementation of mousepad plugin
...
CCMAIL: ahmedibrahimkhali@gmail.com
2014-06-27 15:43:34 +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
741abafaf7
Move the plugins into a different top-ĺevel directory
...
Reviewed by Albert Vaca
2014-06-14 16:34:11 +02:00