Review Request 125246: Update bluetooth branch with code in stable branch (KDE).
Saikrishna Arcot
saiarcot895 at gmail.com
Tue Sep 15 20:24:00 UTC 2015
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/125246/
-----------------------------------------------------------
Review request for kdeconnect.
Repository: kdeconnect-kde
Description
-------
Merge changes made in the stable branch into the bluetooth branch.
Diffs
-----
.gitignore b2337110d76c4c4dc545ed083dd02646e5fcb7cd
CMakeLists.txt fcdd8d28c639315bb1ef1abf5f1699c521faf8d1
KDEConnectMacros.cmake PRE-CREATION
README eef0431a2e25a159801802b519b40c920772e07e
README.md PRE-CREATION
app/CMakeLists.txt PRE-CREATION
app/main.cpp PRE-CREATION
app/org.kde.kdeconnect.app.desktop PRE-CREATION
app/qml/DeviceDelegate.qml PRE-CREATION
app/qml/main.qml PRE-CREATION
app/qml/mousepad.qml PRE-CREATION
app/qml/mpris.qml PRE-CREATION
app/resources.qrc PRE-CREATION
cli/CMakeLists.txt 8a8f40b513217104fc49100758126945a26b7387
cli/kdeconnect-cli.cpp 70a894e1becc306e9c482dad33e9b1b89f253390
cmake/DbusInterfaceMacros.cmake 85a1a75ba187589827a639bf52debd30d34fc18e
core/CMakeLists.txt b622d369b288374577c586915090d7159e86e7ce
core/backends/bluetooth/bluetoothdevicelink.h 199d9ee4c6b89065154e82b6fcd2cea204c0ef31
core/backends/bluetooth/bluetoothdevicelink.cpp e3c1e3335a312a2b9289a7806e6a4d9c9174c73c
core/backends/bluetooth/bluetoothlinkprovider.h ee418886138890ffa8168f98ccffc40f94223ea6
core/backends/bluetooth/bluetoothlinkprovider.cpp 2b78171bb6fbc7630b7bd437112fe0d2f4471304
core/backends/devicelink.h f8d652175f3fc4043f4b3f7ea65d32eb528c84c8
core/backends/devicelink.cpp 4f90754d80eb1ffb559304b4b463e97879c097b8
core/backends/lan/downloadjob.h eeeab07a029b2e27f359fa35bfdf03bfa8dc5b39
core/backends/lan/downloadjob.cpp bba2e988b73f2306ececd5f3f28d80b3091146a5
core/backends/lan/landevicelink.h 7d31881fba33974cb5dbb5b5aceec8bf3fe7c762
core/backends/lan/landevicelink.cpp 09870579b18d9bab500feb7c8e7ad1ed26304624
core/backends/lan/lanlinkprovider.h 1b9af8e8a7a6deabe1ce876a975b709ee3110fc7
core/backends/lan/lanlinkprovider.cpp fb819d1608658f5cbebb2ff2c7af6c4e734f7183
core/backends/lan/netaddress.h f264ba1b4c332eb0bb534adc4a1f4c464e9d6482
core/backends/lan/socketlinereader.h df11c3ee3563d55c8f110a0c651d3cb5ce6c2917
core/backends/lan/socketlinereader.cpp 4fdaf14082c9ef15f917cce0bc0ddc12db20c83c
core/backends/lan/uploadjob.h 4b3dd4d4f5bf52302c0f6b6d5f5ed95f8f007e8b
core/backends/lan/uploadjob.cpp 638adad21f0127ac5a724ae5edd811c7c2c17625
core/backends/linkprovider.h 00805c1b5b890011e4ae043add387318cc367c03
core/backends/loopback/loopbackdevicelink.h 9d1ae14e6ebd538546ce1bdf97c5b70eb6d21fa7
core/backends/loopback/loopbackdevicelink.cpp 718c5b8fd38476a616a9f4d410c8779531de7633
core/backends/loopback/loopbacklinkprovider.h 361e652a791c669b38534a93129afe2e59fa5521
core/backends/loopback/loopbacklinkprovider.cpp cbfc6c6d641a17ccb6b25e9a9c4e1563dd8a14e1
core/core_debug.h 33504de0306534d17fc7eabd1374139610859ea3
core/daemon.h 35efa33e6d6e4cb8ee97cae1cddd504be8a27a8f
core/daemon.cpp dd16d14fbd89687b260e8afe12e1c62423c64f32
core/dbushelper.h 43b22860c100f81ab9dd4140ca24a554dd4cf20f
core/dbushelper.cpp e188126d0605e49949f1652d29105336ffbff250
core/default_args.h d198c6f447504fe5986fb873fb67bc7a65a51f6c
core/device.h 2ebb4034991b516390f2f6bd0c182e16596efb10
core/device.cpp e8412b705a55011118d49a4ddc021bc6f6ffce7c
core/filetransferjob.h 8c94c99495802eb310fd8485da3d2f8dc8127cb9
core/filetransferjob.cpp 66866906a6509ebb0ba00c1b48647c5807262120
core/kdeconnectconfig.h PRE-CREATION
core/kdeconnectconfig.cpp PRE-CREATION
core/kdeconnectplugin.h 564786c296a2643d5e9d1b0c131aa5276668bea2
core/kdeconnectplugin.cpp fd609acba93712725eb7f9c7c7254bc57255b22d
core/kdeconnectpluginconfig.h PRE-CREATION
core/kdeconnectpluginconfig.cpp PRE-CREATION
core/networkpackage.h 83aa8b44eede7d040a4ac0466f6e6c8e0bb628ac
core/networkpackage.cpp c330a2d796488f0acac0a9d974de09c5058bf318
core/networkpackagetypes.h 6aa24a297398bbe64b4adafcf6ce505b8f313772
core/pluginloader.h e92b73e29177a89d40e78dab7a989e91548fbc8f
core/pluginloader.cpp 37bd4baacc08d56f036cd7c74c4b65fb4ab3a97e
daemon/CMakeLists.txt af4d6bc5ca341ff66060f1228c015897434d009e
daemon/kdeconnect.desktop ad509b0649d3c21a79cb20767c98cb1f26d22cd7
daemon/kdeconnectd.cpp 40a53e5bd4029ae173725697830304052669df7c
daemon/kdeconnectd.desktop.cmake 15a560337e460a63eaf76c8220dc465c2a4449ad
daemon/org.kde.kdeconnect.service.in e5f5dfdfb6fedf35fb7ef92334e282e2a59a54ea
fileitemactionplugin/CMakeLists.txt 3df94ad6db289a3ace7e87c70180edf7dba58391
fileitemactionplugin/kdeconnectsendfile.desktop 08268feaf1a4ce2fbec316722501461061088026
fileitemactionplugin/sendfileitemaction.h 21ad1fb8b094e0cea662199c98d1796e4ae8bf83
fileitemactionplugin/sendfileitemaction.cpp c959b2f2d3e392b4381fc3c916bfef3d9406d1dc
icon/32-status-laptop-connected.png PRE-CREATION
icon/32-status-laptop-disconnected.png PRE-CREATION
icon/32-status-laptop-trusted.png PRE-CREATION
icon/32-status-smartphone-connected.png PRE-CREATION
icon/32-status-smartphone-disconnected.png PRE-CREATION
icon/32-status-smartphone-trusted.png PRE-CREATION
icon/32-status-tablet-connected.png PRE-CREATION
icon/32-status-tablet-disconnected.png PRE-CREATION
icon/32-status-tablet-trusted.png PRE-CREATION
icon/CMakeLists.txt 81fdca9f3f17d638b7100f3de5176732f1f0b917
icon/hi128-apps-kdeconnect.png
icon/hi16-apps-kdeconnect.png
icon/hi22-apps-kdeconnect.png
icon/hi256-apps-kdeconnect.png
icon/hi32-apps-kdeconnect.png
icon/hi48-apps-kdeconnect.png
icon/hi64-apps-kdeconnect.png
icon/hi8-apps-kdeconnect.png 71ae5ecd12f38daf9338d5e9114c0b72d8348a1b
icon/hisc-apps-kdeconnect.svgz
icon/sc-status-laptop-connected.svg PRE-CREATION
icon/sc-status-laptop-disconnected.svg PRE-CREATION
icon/sc-status-laptop-trusted.svg PRE-CREATION
icon/sc-status-smartphone-connected.svg PRE-CREATION
icon/sc-status-smartphone-disconnected.svg PRE-CREATION
icon/sc-status-smartphone-trusted.svg PRE-CREATION
icon/sc-status-tablet-connected.svg PRE-CREATION
icon/sc-status-tablet-disconnected.svg PRE-CREATION
icon/sc-status-tablet-trusted.svg PRE-CREATION
interfaces/CMakeLists.txt c94dff0d831bad0115060af32e0449714f23a438
interfaces/dbusinterfaces.h 8f49fe378af06c46b7f5f45371e34bdfe5ceb668
interfaces/dbusinterfaces.cpp 141ef649540290b4d9e83cefd7cddc068cd296e9
interfaces/devicesmodel.h caa3f0a0c3512eb99b2958e69f06bdc2531a3090
interfaces/devicesmodel.cpp 78bec8b75772aa8e9e78fc356e5d93e7d72bb777
interfaces/interfaces_debug.h 5083239766f31ce235beaa32f020cf9d7c8c6e34
interfaces/modeltest.h 38b6b2bed3a7e188a69933a83738204acbcd6c26
interfaces/modeltest.cpp 4c6aea7220bdde26c384a2fabee8ddc9324aa4f9
interfaces/notificationsmodel.h 4dba754ea738882933be330548b23caac6ea0100
interfaces/notificationsmodel.cpp caa4dadc90b36397c851ef0070d457e0eb766c41
kcm/CMakeLists.txt 03796a06ab377a0b997badc81abc0bc250ff0297
kcm/devicessortproxymodel.h 1b6249b3af88e08e1fb2b89da674285ff8971737
kcm/devicessortproxymodel.cpp b83e78ccf50248234398737a7c112a57f6f45855
kcm/kcm.h 92f123de83cc9184e554580dc13e86a5f5fca61b
kcm/kcm.cpp df07d1f972cd704b7acb9f86a81fc23ed21459d1
kcm/kcm.ui 63ca387954b31aa926159c689c38206593e16670
kcm/kcm_kdeconnect.desktop b1067c9419612ed5370a1562223a07a512fd954f
kcm/kdeconnect.desktop 50dc43d611f168be9c0391991884c9c37b12df97
kcm/org.kde.kdeconnect.kcm.desktop PRE-CREATION
kcmplugin/CMakeLists.txt PRE-CREATION
kcmplugin/kdeconnectpluginkcm.h PRE-CREATION
kcmplugin/kdeconnectpluginkcm.cpp PRE-CREATION
kdeconnect-non-plasma.desktop 60b7ae482d685e25c08f3b30f79706be934fe932
kdeconnect.appdata.xml PRE-CREATION
kio/CMakeLists.txt fc81f4a206a80bf53ddd7ae4d6a368aec7bb65ad
kio/kiokdeconnect.h f655cb226beafe59bae48348f4d89cdc9025952d
kio/kiokdeconnect.cpp 0333a9b4f428bf84695f7cd02a8625b0eb39491b
org.kde.kdeconnect.nonplasma.desktop PRE-CREATION
plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.h 85d0cf04fe344ac35b468810cd93aab1b6c48674
plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.cpp 5b9716f0902f81011d31b7391412e9b6c5ea2c59
plasmoid/declarativeplugin/objectfactory.h 0a4a8ca53effee07bc882eb9ee06cdca265fc107
plasmoid/declarativeplugin/processrunner.h 20e86e69b203016a8252c2e32e7a872df100b7f2
plasmoid/declarativeplugin/responsewaiter.h a2aec19944d043267364088811870da6fe2b8c2d
plasmoid/declarativeplugin/responsewaiter.cpp e909842c2fd983aadf5ca20b333e56a6a9e86714
plasmoid/package/contents/ui/DeviceDelegate.qml d774f66bac3fb77c847032ed2a84ce6ffd660e58
plasmoid/package/contents/ui/FindMyPhone.qml PRE-CREATION
plasmoid/package/contents/ui/FullRepresentation.qml 98e2e03495f1080d1d0357b409e11d202248200c
plasmoid/package/contents/ui/main.qml 71e66b1d529dc434508c1bb70d60191aadb156a3
plasmoid/package/metadata.desktop df63128eec8e5cb213466f03dba5f4da9cd420e3
plugins/CMakeLists.txt 083c087a298d44f035e059100b0711931dcb7168
plugins/battery/CMakeLists.txt d2a4237b6190c3cfb73eb5675f2ab32d01868270
plugins/battery/batterydbusinterface.h b444ae2194971af1c728189f680d92e9f4de01eb
plugins/battery/batterydbusinterface.cpp 7602585ca09d1370bb68afe715fd3932eaa10d05
plugins/battery/batteryplugin.h bf459f6816021dd78dec862f89b8cadaa18a4d3c
plugins/battery/batteryplugin.cpp 320215686df481a1f8dc4fd8d1029e103adcf8fd
plugins/battery/kdeconnect_battery.desktop 9601e045a0451b82d4449676b4f653bbb75af9b3
plugins/battery/kdeconnect_battery.json PRE-CREATION
plugins/clipboard/CMakeLists.txt 3f8ef3cad33d0295fe496298614a8c0b17f74959
plugins/clipboard/clipboardplugin.h f2198f441413c61927d5335e44e77e4d748fc74a
plugins/clipboard/clipboardplugin.cpp f9b27150c127db6d7f1091ae637707d1f90fff6a
plugins/clipboard/kdeconnect_clipboard.desktop 94faa783021656e9e96db0c502b539818b4e11f0
plugins/clipboard/kdeconnect_clipboard.json PRE-CREATION
plugins/findmyphone/CMakeLists.txt PRE-CREATION
plugins/findmyphone/findmyphoneplugin.h PRE-CREATION
plugins/findmyphone/findmyphoneplugin.cpp PRE-CREATION
plugins/findmyphone/kdeconnect_findmyphone.json PRE-CREATION
plugins/kdeconnect.notifyrc 3b2eed8ed1b6d8d1765d7a1c39f32cee02f736dc
plugins/kdeconnect_plugin.desktop 02bdde62e7d81c29656e2ee04cf5c40d507e1887
plugins/lockdevice/CMakeLists.txt PRE-CREATION
plugins/lockdevice/kdeconnect_lockdevice.json PRE-CREATION
plugins/lockdevice/lockdeviceplugin.h PRE-CREATION
plugins/lockdevice/lockdeviceplugin.cpp PRE-CREATION
plugins/lockdevice/org.freedesktop.ScreenSaver.xml PRE-CREATION
plugins/mousepad/CMakeLists.txt a0994fbbedf9c6980a717019d593c83d0f7529fc
plugins/mousepad/config-mousepad.h.cmake PRE-CREATION
plugins/mousepad/fixx11h.h 8d69e156d44b0c74e5f0540b2b400c4268430237
plugins/mousepad/kdeconnect_mousepad.desktop 26304164082e1df209a296def433c321e76a0f84
plugins/mousepad/kdeconnect_mousepad.json PRE-CREATION
plugins/mousepad/mousepadplugin.h e8ce48028a253a3668871db2394400274b574c3d
plugins/mousepad/mousepadplugin.cpp 958a288caeedd5e2ffdde866f7435873c73b8f43
plugins/mpriscontrol/CMakeLists.txt f10c502e159bc06808afe70c7542ae4aa2f2f489
plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop e9d4e3ca77bfe3d2cc3649c889ce801cf76a981b
plugins/mpriscontrol/kdeconnect_mpriscontrol.json PRE-CREATION
plugins/mpriscontrol/mpriscontrolplugin.h 038f4b2dc610e15cb1d67281036198ccbcabb1e1
plugins/mpriscontrol/mpriscontrolplugin.cpp 7d705e7782f26bed74d88279ea04b8685c078fe6
plugins/mprisremote/CMakeLists.txt PRE-CREATION
plugins/mprisremote/kdeconnect_mprisremote.json PRE-CREATION
plugins/mprisremote/mprisremoteplugin.h PRE-CREATION
plugins/mprisremote/mprisremoteplugin.cpp PRE-CREATION
plugins/notifications/CMakeLists.txt 9f564719034b266ee0b969d5df5982f0b3dc58ae
plugins/notifications/kdeconnect_notifications.desktop 040f5fef56f850f39a8a10fe417f05dbf4015d6a
plugins/notifications/kdeconnect_notifications.json PRE-CREATION
plugins/notifications/notification_debug.h 09da52f8f97aa76a039011a7c3174cb79dd509c4
plugins/notifications/notificationsdbusinterface.h 5c1244ef11e5a0d31d1de4ff80714a15ed59a79d
plugins/notifications/notificationsdbusinterface.cpp 26323ae17f5cf891568c8cf9e82257f26ab2317d
plugins/notifications/notificationsplugin.h a2e7828022607b03bf41e8f60bab4f3e9d7971c7
plugins/notifications/notificationsplugin.cpp 9af82e1053daaaa51d4eabbb4eaa99cc0fa6d580
plugins/pausemusic/CMakeLists.txt 44d0902f6a9bc229cdb5b06352e8388bfb24f58d
plugins/pausemusic/kdeconnect_pausemusic.desktop 31e40d3417173af8df2eb77d2f110e6807b0a0a6
plugins/pausemusic/kdeconnect_pausemusic.json PRE-CREATION
plugins/pausemusic/kdeconnect_pausemusic_config.desktop 0d9a3091463e74f1bf2e0df5debeb394a3b1b3cd
plugins/pausemusic/pausemusic_config.h 075e2958d7f0198c9402456c81f02fc11f5999e3
plugins/pausemusic/pausemusic_config.cpp 03dacf9ab79b1f1ef3d0c12adf675e710de94821
plugins/pausemusic/pausemusicplugin.h 76c08c02f124a3dcb9eb0973af2a67926842267c
plugins/pausemusic/pausemusicplugin.cpp a9cdc681183e372f3ff029a263024f3e99468385
plugins/ping/CMakeLists.txt 7628fd8fcca3f2e9409d1b2e21dd1811396c36ba
plugins/ping/kdeconnect_ping.desktop 46959a1106bb09274f1e2afee2bcdae02ef093db
plugins/ping/kdeconnect_ping.json PRE-CREATION
plugins/ping/pingplugin.h 3217dcdab9e75d16fce8e03766ded90716265cb3
plugins/ping/pingplugin.cpp 72c2a50da2bd60fb42674ef7253944e62537934b
plugins/remotecontrol/CMakeLists.txt PRE-CREATION
plugins/remotecontrol/kdeconnect_remotecontrol.json PRE-CREATION
plugins/remotecontrol/remotecontrolplugin.h PRE-CREATION
plugins/remotecontrol/remotecontrolplugin.cpp PRE-CREATION
plugins/runcommand/CMakeLists.txt PRE-CREATION
plugins/runcommand/kdeconnect_runcommand.json PRE-CREATION
plugins/runcommand/kdeconnect_runcommand_config.desktop PRE-CREATION
plugins/runcommand/runcommand_config.cpp PRE-CREATION
plugins/runcommand/runcommandplugin.cpp PRE-CREATION
plugins/screensaver-inhibit/CMakeLists.txt f7bda444471355941f6206ddc813fb0c94f68395
plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop 01f1572ca0f71313c2aea45d94246a1d51e6f81b
plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json PRE-CREATION
plugins/screensaver-inhibit/screensaverinhibitplugin.h d2efeca374a138fa9a55a4ac7e10dfa57e171151
plugins/screensaver-inhibit/screensaverinhibitplugin.cpp 4d74fb4a4501cc9d585384f0dfc13bc8eada6858
plugins/sftp/CMakeLists.txt 384d70f69db0ae1490353603a3065fdcae7515d8
plugins/sftp/kdeconnect_sftp.desktop 9c3c53c7da38aecd0dccfe4ee147363e21627e95
plugins/sftp/kdeconnect_sftp.json PRE-CREATION
plugins/sftp/kdeconnect_sftp_config.desktop 17477c551d809fbe89f987c96f2f39b90b054290
plugins/sftp/mounter.h 91b6bade606a7d5178a77a9c3b478d156c0bdb61
plugins/sftp/mounter.cpp 9ced0ed7cd8a30c5bd3de4e2d5c5c3ba34078a6a
plugins/sftp/sftp_config.h 5ed9b269eaf7a35c3c86c3c12310589d44383fcc
plugins/sftp/sftp_config.cpp 31a068990a2671e26870befc2ba08638fecd10b8
plugins/sftp/sftp_config.ui 30e1c797e7448b361fc38a8ede9017c8328ebc34
plugins/sftp/sftp_debug.h 30da8f8158fd305e5a48c6d6dcf5f029823382d9
plugins/sftp/sftpplugin.h afd651e53bcdd1aa81fe4a3c0eec3f3f51e1021c
plugins/sftp/sftpplugin.cpp e98b087dc1452440349b7d266fe8426b8e353d49
plugins/share/CMakeLists.txt 4783864902773106afa40f7d7b55706a879bab27
plugins/share/autoclosingqfile.h 54dea8318a7069d1bdbbb61167134cbfc9dec3da
plugins/share/kdeconnect_share.desktop ef67f9886e61994fe3eaf9cc1f612aad7f631546
plugins/share/kdeconnect_share.json PRE-CREATION
plugins/share/kdeconnect_share_config.desktop 5e5cefaed4b9464b56135710bcf3f78a1bee378a
plugins/share/share_config.h 7743fcc9c1f0f8d162a66dfbc048cdd71610b826
plugins/share/share_config.cpp 397547ac15e2cc1578359b7e0dee0bbf1abeb429
plugins/share/share_config.ui ef919f953181a8111c4dd46690f8e1808c895036
plugins/share/share_debug.h d6cf4161e43503f2cdef470a5ae6267cd4a03e67
plugins/share/shareplugin.h de00693d10ae633711c340b27db24d995c66c7c7
plugins/share/shareplugin.cpp 5db0254799f03cf525b605c8cb6818c70539b9b0
plugins/telephony/CMakeLists.txt 8db5629d6bf592d40265d4a0c25413a53573fd59
plugins/telephony/kdeconnect_telephony.desktop d44b59512f5c0f430713a816c1216c4da957d937
plugins/telephony/kdeconnect_telephony.json PRE-CREATION
plugins/telephony/sendsmsdialog.h PRE-CREATION
plugins/telephony/sendsmsdialog.cpp PRE-CREATION
plugins/telephony/telephonyplugin.h fb57d5ebdfa74fb9c8fa7ed92e865a438c5cf156
plugins/telephony/telephonyplugin.cpp e8d9ad56b0beb60a6161848aae5bfaa58006e2e7
telepathy-cm/CMakeLists.txt PRE-CREATION
telepathy-cm/README PRE-CREATION
telepathy-cm/connectcm_export.h PRE-CREATION
telepathy-cm/connection.h PRE-CREATION
telepathy-cm/connection.cpp PRE-CREATION
telepathy-cm/kdeconnect.manager PRE-CREATION
telepathy-cm/kdeconnecttelepathyprotocolfactory.h PRE-CREATION
telepathy-cm/kdeconnecttelepathyprotocolfactory.cpp PRE-CREATION
telepathy-cm/protocol.h PRE-CREATION
telepathy-cm/protocol.cpp PRE-CREATION
telepathy-cm/textchannel.h PRE-CREATION
telepathy-cm/textchannel.cpp PRE-CREATION
tests/CMakeLists.txt 4c508b74baa04098eb1bc6be1a29abe9d471c7f7
tests/networkpackagetests.cpp 9bddf1a7b851b721122bed4661ee493b088cfb87
tests/pluginloadtest.cpp PRE-CREATION
tests/sendfiletest.cpp PRE-CREATION
tests/testsocketlinereader.cpp 185816d14311e8502b102f0b4afb6c6728a197bc
Diff: https://git.reviewboard.kde.org/r/125246/diff/
Testing
-------
Not yet tested, but changes have been made to the bluetooth code so that it compiles.
Thanks,
Saikrishna Arcot
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kdeconnect/attachments/20150915/2763391c/attachment-0001.html>
More information about the KDEConnect
mailing list