Albert Vaca
6cc6d287fc
Merge branch 'master' into frameworks
...
Conflicts:
cli/kdeconnect-cli.cpp
core/filetransferjob.cpp
core/filetransferjob.h
interfaces/notificationsmodel.cpp
plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.h
plugins/sftp/sftpplugin.cpp
2015-01-20 22:44:31 -08:00
Albert Vaca
86bfbf1a4c
Trying to fix a crash when exiting KDE Connect.
2015-01-20 20:58:32 -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
7a214e72ee
SFTP plugin now supports devices with multiple external storages
2014-10-10 15:01:21 -07: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
677f650216
Removed K_EXPORT_PLUGIN, no longer needed
...
With kf5 this is not longer needed. removing it!
2014-09-22 02:40:51 +02:00
Àlex Fiestas
b9c9f97fa4
Port sftp plugin to QStandardPaths
...
I have not been able to test this, but double checked the return values
and they should be the same.
2014-09-22 01:24:42 +02:00
Àlex Fiestas
008f082ac0
Port sftp pluging from kDebug to qCDebug
2014-09-22 00:45:59 +02:00
Àlex Fiestas
542c872a16
Port sftp plugin to Qurl
...
Since QUrl are buid with kdeconnect:/ (aka not local) we don't have to
change anything.
2014-09-21 22:23:31 +02:00
Albert Vaca
871a2bf5a9
Fixed crash when shutting down the daemon
2014-08-11 18:57:48 +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
Aleix Pol
b618a64f51
Merge remote-tracking branch 'origin/master' into frameworks
...
Conflicts:
cli/kdeconnect-cli.cpp
2014-06-18 02:46:14 +02:00
Albert Vaca
dd43479956
Now plugins load by default the kdeconnect-plugins catalog.
2014-06-17 22:21:20 +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
