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
|
da1cb4c354
|
Coding style
|
2015-01-20 22:22:14 -08:00 |
|
Albert Vaca
|
91d4a03258
|
Made notification id accessible from QML
|
2015-01-20 22:17:01 -08:00 |
|
Aleix Pol
|
968ccb22c6
|
Port away from deprecated setRoleNames
|
2014-09-23 19:27:47 +02:00 |
|
Àlex Fiestas
|
02fd748f41
|
Interfaces no longer depend on kdelibs4support
Also since fileitemactionplugin was using them (and inhering
kdelibs4support) not we have tu explicitly link against it in there.
|
2014-09-22 00:16:39 +02:00 |
|
Àlex Fiestas
|
42269a9dda
|
Port from KIcon to QIcon
Executed kcm and some notifications, icons are still shown.
|
2014-09-13 01:04:48 +02:00 |
|
Lukáš Tinkl
|
994057af0e
|
fix the Configure action
display the kdeconnect kcm
|
2014-09-10 10:19:44 +02:00 |
|
Albert Vaca
|
12411da360
|
Added some debug info to devices and notifications models
|
2014-07-01 01:26:08 +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 |
|