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 |
|
Aleix Pol
|
968ccb22c6
|
Port away from deprecated setRoleNames
|
2014-09-23 19:27:47 +02:00 |
|
Albert Vaca
|
d72ebc4cf7
|
Workaround to make devices be correctly filtered again.
Flags in QML are not working correctly (as they are in Qt5), so we will
use integer values for the flags for now.
|
2014-07-01 01:26:07 +02:00 |
|
Aleix Pol
|
446dbbc230
|
Remove IsPairedRole
It was not a good idea
|
2014-06-27 16:16:45 +02:00 |
|
Aleix Pol
|
e227c61cf8
|
Expose flags so that the plasmoid doesn't need to use magic numbers
|
2014-06-27 16:09:01 +02:00 |
|
Aleix Pol
|
dc2f9c0f3c
|
Introduce a IsPaired role in the DevicesModel
Reviewed by Albert Vaca
|
2014-06-23 18:13:43 +02:00 |
|
Aleix Pol
|
b7420146eb
|
Expose the icon name from the device instance
|
2014-06-14 19:42:34 +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 |
|